katello 3.6.0.1.rc2 → 3.7.0.rc1

data/app/models/katello/subscription_product.rb

@@ -1,6 +0,0 @@
-module Katello
-  class SubscriptionProduct < Katello::Model
-    belongs_to :product, :inverse_of => :subscription_products, :class_name => 'Katello::Product'
-    belongs_to :subscription, :inverse_of => :subscription_products, :class_name => 'Katello::Subscription'
-  end
-end

data/app/views/foreman/unattended/finish-katello.erb

@@ -1,60 +0,0 @@
-<%#
-kind: finish
-name: Katello Kickstart default finish
-oses:
-- CentOS 5
-- CentOS 6
-- CentOS 7
-- RedHat 5
-- RedHat 6
-- RedHat 7
-- Fedora 19
-- Fedora 20
-%>
-<% if @host.subnet.respond_to?(:dhcp_boot_mode?) -%>
-<%= snippet 'kickstart_networking_setup' %>
-service network restart
-<% end -%>
-
-<%
-  rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
-  os_major = @host.operatingsystem.major.to_i
-  pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = pm_set || host_param('force-puppet')
-  salt_enabled = host_param('salt_master') ? true : false
-  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
-%>
-
-<%= snippet "subscription_manager_registration" %>
-
-<% if @host.respond_to?(:realm) && @host.otp && @host.realm && @host.realm.realm_type == "FreeIPA" -%>
-<%= snippet "freeipa_register" %>
-<% end -%>
-
-# update local time
-echo "updating system time"
-/usr/sbin/ntpdate -sub <%= host_param('ntp-server') || '0.fedora.pool.ntp.org' %>
-/usr/sbin/hwclock --systohc
-
-<% if host_param('realm') && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
-<%= snippet "freeipa_register" %>
-<% end -%>
-
-# update all the base packages from the updates repository
-yum -t -y -e 0 update
-
-<%= snippet('remote_execution_ssh_keys') %>
-
-<% if chef_enabled %>
-<%= snippet 'chef_client' %>
-<% end -%>
-
-<% if puppet_enabled %>
-<%= snippet 'puppet_setup' %>
-<% end -%>
-
-<% if salt_enabled %>
-<%= snippet 'saltstack_setup' %>
-<% end -%>
-
-exit 0

data/app/views/foreman/unattended/kickstart-katello-atomic.erb

@@ -1,51 +0,0 @@
-<%#
-kind: provision
-name: Katello Atomic Kickstart default
-%>
-
-lang <%= host_param('lang') || 'en_US.UTF-8' %>
-keyboard <%= host_param('keyboard') || 'us' %>
-timezone --utc <%= host_param('time-zone') || 'UTC' %>
-
-<% subnet = @host.subnet -%>
-<% if subnet.respond_to?(:dhcp_boot_mode?) -%>
-<% dhcp = subnet.dhcp_boot_mode? && !@static -%>
-<% else -%>
-<% dhcp = !@static -%>
-<% end -%>
-
-network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{subnet.mask} --gateway=#{subnet.gateway} --nameserver=#{[subnet.dns_primary, subnet.dns_secondary].select{ |item| item.present? }.join(',')}" %> --hostname <%= @host %><%= " --device=#{@host.mac}" -%>
-
-# Partition table should create /boot and a volume atomicos
-<% if @dynamic -%>
-%include /tmp/diskpart.cfg
-<% else -%>
-<%= @host.diskLayout %>
-<% end -%>
-
-bootloader --timeout=3
-text
-
-<% if @host.os.name.match /.*fedora.*/i -%>
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=<%= @host.param_true?('atomic-upstream') ? "https://dl.fedoraproject.org/pub/fedora/linux/atomic/#{@host.os.major}/" : "#{@host.operatingsystem.medium_uri(@host)}/content/repo/" %> --ref=fedora-atomic/f<%= @host.os.major %>/<%= @host.architecture %>/docker-host
-<% elsif @host.os.name.match /.*centos.*/i -%>
-ostreesetup --nogpg --osname=centos-atomic-host --remote=centos-atomic-host --url=<%= @host.param_true?('atomic-upstream') ? "http://mirror.centos.org/centos/#{@host.os.major}/atomic/#{@host.architecture}/repo/" : @host.operatingsystem.medium_uri(@host) %> --ref=centos-atomic-host/<%= @host.os.major %>/<%= @host.architecture %>/standard
-<% else -%>
-ostreesetup --nogpg --osname=rhel-atomic-host --remote=rhel-atomic-host --url=file:///install/ostree --ref=rhel-atomic-host/<%= @host.os.major %>/<%= @host.architecture %>/standard
-<% end -%>
-services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local
-rootpw --iscrypted <%= root_pass %>
-
-reboot
-
-%post
-<%= snippet "subscription_manager_registration" %>
-<%= snippet('remote_execution_ssh_keys') %>
-(
-# Report success back to Foreman
-curl -s -o /dev/null --insecure <%= foreman_url('built') %>
-) 2>&1 | tee /mnt/sysimage/root/install.post.log
-
-exit 0
-
-%end

data/app/views/foreman/unattended/kickstart-katello.erb

@@ -1,139 +0,0 @@
-<%#
-kind: provision
-name: Katello Kickstart default
-oses:
-- CentOS 5
-- CentOS 6
-- CentOS 7
-- RedHat 5
-- RedHat 6
-- RedHat 7
-- Fedora 19
-- Fedora 20
-%>
-<%
-  rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
-  os_major = @host.operatingsystem.major.to_i
-  # safemode renderer does not support unary negation
-  pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = pm_set || host_param('force-puppet')
-  salt_enabled = host_param('salt_master') ? true : false
-  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
-  section_end = (rhel_compatible && os_major <= 5) ? '' : '%end'
-%>
-install
-<%= @mediapath %>
-lang en_US.UTF-8
-selinux --enforcing
-keyboard us
-skipx
-
-<% subnet = @host.subnet -%>
-<% if subnet.respond_to?(:dhcp_boot_mode?) -%>
-<% dhcp = subnet.dhcp_boot_mode? && !@static -%>
-<% else -%>
-<% dhcp = !@static -%>
-<% end -%>
-
-network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{subnet.mask} --gateway=#{subnet.gateway} --nameserver=#{[subnet.dns_primary, subnet.dns_secondary].select{ |item| item.present? }.join(',')}" %> --hostname <%= @host %><%= os_major >= 6 ? " --device=#{@host.mac}" : '' -%>
-
-rootpw --iscrypted <%= root_pass %>
-firewall --<%= os_major >= 6 ? 'service=' : '' %>ssh
-authconfig --useshadow --passalgo=<%= @host.operatingsystem.password_hash || 'sha256' %> --kickstart
-timezone --utc <%= host_param('time-zone') || 'UTC' %>
-
-<% if @host.operatingsystem.name == 'Fedora' and os_major <= 16 -%>
-# Bootloader exception for Fedora 16:
-bootloader --append="nofb quiet splash=quiet <%=ks_console%>" <%= grub_pass %>
-part biosboot --fstype=biosboot --size=1
-<% else -%>
-bootloader --location=mbr --append="nofb quiet splash=quiet" <%= grub_pass %>
-<% end -%>
-
-<% if os_major == 5 -%>
-key --skip
-<% end -%>
-
-<% if @dynamic -%>
-%include /tmp/diskpart.cfg
-<% else -%>
-<%= @host.diskLayout %>
-<% end -%>
-
-text
-reboot
-
-%packages --ignoremissing
-yum
-dhclient
-ntp
-wget
-@Core
-<%= section_end -%>
-
-<% if @dynamic -%>
-%pre
-<%= @host.diskLayout %>
-<%= section_end -%>
-<% end -%>
-
-%post --nochroot
-exec < /dev/tty3 > /dev/tty3
-#changing to VT 3 so that we can see whats going on....
-/usr/bin/chvt 3
-(
-cp -va /etc/resolv.conf /mnt/sysimage/etc/resolv.conf
-/usr/bin/chvt 1
-) 2>&1 | tee /mnt/sysimage/root/install.postnochroot.log
-<%= section_end -%>
-
-
-%post
-logger "Starting anaconda <%= @host %> postinstall"
-exec < /dev/tty3 > /dev/tty3
-#changing to VT 3 so that we can see whats going on....
-/usr/bin/chvt 3
-(
-<% if subnet.respond_to?(:dhcp_boot_mode?) -%>
-<%= snippet 'kickstart_networking_setup' %>
-<% end -%>
-
-#update local time
-echo "updating system time"
-/usr/sbin/ntpdate -sub <%= host_param('ntp-server') || '0.fedora.pool.ntp.org' %>
-/usr/sbin/hwclock --systohc
-
-<%= snippet "subscription_manager_registration" %>
-
-<% if host_param('realm') && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
-<%= snippet "freeipa_register" %>
-<% end -%>
-
-# update all the base packages from the updates repository
-yum -t -y -e 0 update
-
-<%= snippet('remote_execution_ssh_keys') %>
-
-<% if chef_enabled %>
-<%= snippet 'chef_client' %>
-<% end -%>
-
-<% if puppet_enabled %>
-<%= snippet 'puppet_setup' %>
-<% end -%>
-
-<% if salt_enabled %>
-<%= snippet 'saltstack_setup' %>
-<% end -%>
-
-sync
-
-<% if @provisioning_type == nil || @provisioning_type == 'host' -%>
-# Inform the build system that we are done.
-echo "Informing Foreman that we are built"
-wget -q -O /dev/null --no-check-certificate <%= foreman_url('built') %>
-<% end -%>
-) 2>&1 | tee /root/install.post.log
-exit 0
-
-<%= section_end -%>

data/app/views/foreman/unattended/snippets/_subscription_manager_registration.erb

@@ -1,18 +0,0 @@
-<% if host_param('kt_activation_keys') %>
-  # add subscription manager
- <% if @host.operatingsystem.atomic? %>
-  curl -s <%= subscription_manager_configuration_url(@host, false) %> | IS_ATOMIC=true bash
- <% else %>
-  yum -t -y -e 0 install subscription-manager
-  rpm -ivh <%= subscription_manager_configuration_url(@host) %>
- <% end %>
-
-  echo "Registering the System"
-  subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= host_param('kt_activation_keys') %>"
-
-  <% unless @host.operatingsystem.atomic? %>
-    echo "Installing Katello Agent"
-    yum -t -y -e 0 install katello-agent
-    chkconfig goferd on
-  <% end %>
-<% end %>

data/app/views/foreman/unattended/userdata-katello.erb

@@ -1,92 +0,0 @@
-<%#
-kind: user_data
-name: Katello Kickstart default user data
-oses:
-- CentOS 6
-- CentOS 7
-- Fedora 19
-- Fedora 20
-- Fedora 21
-- Fedora 22
-- Fedora 23
--%>
-#cloud-config
-hostname: <%= @host.shortname %>
-fqdn: <%= @host %>
-manage_etc_hosts: true
-
-groups:
- - admin
-
-users:
- - default
- - name: admin
-   primary-group: admin
-   groups: users
-   shell: /bin/bash
-   sudo: ['ALL=(ALL) ALL']
-   lock-passwd: false
-   passwd: <%= @host.root_pass %>
-
-<%# Allow user to specify additional SSH key as host paramter -%>
-<% if host_param('sshkey').present? || host_param('remote_execution_ssh_keys').present? -%>
-ssh_authorized_keys:
-<% if host_param('sshkey').present? -%>
-  - <%= host_param('sshkey') %>
-<% end -%>
-<% if host_param('remote_execution_ssh_keys').present? -%>
-<% host_param('remote_execution_ssh_keys').each do |key| -%>
-  - <%= key %>
-<% end -%>
-<% end -%>
-<% end -%>
-write_files:
-- path: /tmp/foreman-userdata.sh
-  permissions: '0755'
-  content: |
-    #!/bin/bash
-<%= indent 4 do
-      snippet 'subscription_manager_registration'
-    end %>
-<% if host_param('realm') && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
-<%= indent 4 do
-      snippet 'freeipa_register'
-    end %>
-<% end -%>
-  <% unless @host.operatingsystem.atomic? -%>
-    # update all the base packages from the updates repository
-    yum -t -y -e 0 update
-  <% end -%>
-<%
-  # safemode renderer does not support unary negation
-  non_atomic = @host.operatingsystem.atomic? ? false : true
-  pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = non_atomic && (pm_set || host_param('force-puppet'))
-  salt_enabled = non_atomic && (host_param('salt_master') ? true : false)
-  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
-%>
-<% if chef_enabled %>
-<%= indent 4 do
-      snippet 'chef_client'
-    end  %>
-<% end -%>
-
-<% if puppet_enabled %>
-<%= indent 4 do
-      snippet 'puppet_setup'
-    end %>
-<% end -%>
-
-<% if salt_enabled %>
-<%= indent 4 do
-      snippet 'saltstack_setup'
-    end %>
-<% end -%>
-phone_home:
- url: <%= foreman_url('built') %>
- post: []
- tries: 10
-runcmd:
- - [ cloud-init-per, once, foreman-userdata, /tmp/foreman-userdata.sh ]
-output: {all: '| tee -a /root/install.userdata.log'}
-

data/app/views/katello/providers/redhat/_enable_errors.html.erb

@@ -1,12 +0,0 @@
-<span class="errors">
-  <br/>
-  <i class="icon-exclamation-sign"></i>
-  <%= _("There was an error attempting to enable or disable this repository:") %>
-  <pre>
-    <%= error_message %>
-  </pre>
-  <%= _("For more information see ") %>
-  <a href="<%= main_app.foreman_tasks_tasks_path %>">
-    <%= _("the related failed task.") %>
-  </a>
-</span>

data/app/views/katello/providers/redhat/_errors.html.erb

@@ -1,19 +0,0 @@
-<table class="repo_table" style="display: none;">
-  <thead>
-    <th>
-      <%= _('Errors') %>
-    </th>
-  <tbody>
-    <td>
-      <i class="icon-exclamation-sign"></i>
-      <%= _("There was an error attempting to retrieve the repository list:") %>
-      <pre>
-        <%= error_message %>
-      </pre>
-      <%= _("For more information see ") %>
-      <a href="<%= main_app.foreman_tasks_task_path(task.id) %>">
-        <%= _("the failed task.") %>
-      </a>
-    </td>
-  </tbody>
-</table>

data/app/views/katello/providers/redhat/_repo_sets.html.erb

@@ -1,56 +0,0 @@
-<table class="tree_table">
-  <thead>
-    <tr>
-      <th>
-        <%= _("Product") %>
-      </th>
-    </tr>
-  </thead>
-  <tbody>
-    <% for product in provider.products.order(:name) %>
-      <% orphaned = orphaned_product_ids.include?(product.id) %>
-      <% if product_map[product.id] %>
-        <% contents = product_map[product.id].sort{|p1, p2| p1.content.name <=> p2.content.name} %>
-        <% has_content = !orphaned || product.repositories.size > 0 %>
-        <% if has_content %>
-          <tr class="product <%= cycle(nil, 'alt') %>" id="<%= tab_id%>_prod_<%= product.id %>">
-            <td>
-              <%= "#{product.name} " +  (orphaned ? _('(Orphaned)') : '') %>
-            </td>
-          </tr>
-          <tr class="child-of-<%= tab_id %>_prod_<%= product.id %> <%= current_cycle %>">
-            <td>
-              <table class="content_table">
-                <thead>
-                  <th>
-                    <%= _('Repository Set') %>
-                  </th>
-                </thead>
-                <tbody>
-                  <% for product_content in contents %>
-                    <% if !orphaned || product.repositories.any? {|repo| repo.cp_label == product_content.content.label} %>
-                      <tr class="collapsed repo_set" id="repo_set_<%= product_content.content.cp_content_id %>">
-                        <td>
-                          <span class="expander_area clickable"
-                                data-url="<%= katello.available_repositories_product_path(product.id)%>"
-                                data-content-id="<%= product_content.content.cp_content_id %>"
-                                data-orphaned="<%= orphaned.to_s %>">
-                            <%= image_tag( "katello/icons/spinner.gif", :class=>"hidden fl repo_set_spinner",
-                                  :id=>"spinner_set_#{product_content.content.cp_content_id}", :style=>"margin-left:-18px;") %>
-                            <span class="expander"></span>
-                            <%= product_content.content.name %>
-                          </span>
-                          <table style="display:none;"></table>
-                        </td>
-                      </tr>
-                    <% end %>
-                  <% end %>
-                </tbody>
-              </table>
-            </td>
-          </tr>
-        <% end %>
-      <% end %>
-    <% end %>
-  </tbody>
-</table>