foreman_puppet 5.0.0 → 5.1.2

data/app/views/provisioning_templates/temp/snippet/_or_deb_client.erb

@@ -0,0 +1,175 @@
+<%#
+kind: snippet
+name: or_deb_client
+model: ProvisioningTemplate
+snippet: true
+description: template for debian provisioning
+%>
+<%
+  content_facet = host_content_facet(@host)
+  apt_run = 'apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"'
+  apt_install = apt_run + ' -y install'
+  apt_upgrade = apt_run + ' -o APT::Get::Upgrade-Allow-New="true" -y upgrade'
+  apt_update = 'apt-get -y update'
+
+  if !host_param("or_client_repo_url").nil?
+    or_client_repo_url = host_param("or_client_repo_url")
+  elsif !host_param("or_#{@host.operatingsystem.name.downcase}_client_repo_prefix").nil?
+    or_client_repo_url = host_param("or_#{@host.operatingsystem.name.downcase}_client_repo_prefix") + @host.operatingsystem.major.gsub('.', '_')
+  else
+    or_client_repo_url = nil
+  end
+  if content_facet && content_facet.content_source_name
+    host_content_fqdn = content_facet.content_source_name
+    host_content_url = "https://"+content_facet.content_source_name
+  else
+    host_content_fqdn = foreman_server_fqdn
+    host_content_url = foreman_server_url
+  end
+  if !host_param('http-proxy').nil?
+    http_proxy = host_param('http-proxy')
+    if !host_param('http-proxy-port').nil?
+      http_proxy_port = host_param('http-proxy-port')
+    else
+      http_proxy_port = "3129"
+    end
+  end
+  if !host_param('http-proxy-user').nil? && !host_param('http-proxy-password').nil?
+    http_proxy_user = host_param('http-proxy-user')
+    http_proxy_password = host_param('http-proxy-password')
+    proxy_uri = http_proxy ? "http://#{http_proxy_user}:#{http_proxy_password}@#{http_proxy}:#{http_proxy_port}" : nil
+  else
+    proxy_uri = http_proxy ? "http://#{http_proxy}:#{http_proxy_port}" : nil
+  end
+
+  use_trusted_gpg_d =
+    if @host.operatingsystem.name == 'Debian' && @host.operatingsystem.major.to_i >= 11
+      true
+    elsif @host.operatingsystem.name == 'Ubuntu' && @host.operatingsystem.major.split('.')[0].to_i >= 22
+      true
+    else
+      false
+    end
+%>
+
+<%- if @host.operatingsystem.family == 'Debian' -%>
+echo "Installing or_deb_client repository"
+
+  <%- if or_client_repo_url.nil? -%>
+echo "================================= Warning ============================================="
+echo "Warning: To provision Debian clients, you need to prepare an 'or_deb_client'-repository"
+echo "  and write it's location in the global parameter 'or_<%= @host.operatingsystem.name.downcase %>_client_repo_prefix'."
+echo "================================= Warning ============================================="
+  <%- end -%>
+
+  <%- if !content_facet || !content_facet.content_source_name -%>
+echo "================================= Warning ============================================="
+echo " No content source found. Setting default to <%= foreman_server_fqdn %>"
+echo "================================= Warning ============================================="
+  <%- end -%>
+
+
+  <% if proxy_uri -%>
+# Add http proxy to apt
+echo 'Acquire::http::Proxy "<%= proxy_uri %>";' >> /etc/apt/apt.conf.d/proxy.conf
+echo 'Acquire::http::Proxy::<%= @preseed_server.split(":")[0] %> "DIRECT";' >> /etc/apt/apt.conf.d/proxy.conf
+
+# Add http proxy to wget
+echo 'use_proxy=yes' >> /etc/wgetrc
+echo 'http_proxy=<%= proxy_uri %>' >> /etc/wgetrc
+echo 'https_proxy=<%= proxy_uri %>' >> /etc/wgetrc
+  <% end -%>
+
+  <% if @host.operatingsystem.name == 'Ubuntu' -%>
+# Disable Phased-Updates for Ubuntu
+cat << EOF >/etc/apt/apt.conf.d/98phased-updates
+APT::Get::Always-Include-Phased-Updates "true";
+EOF
+  <% end -%>
+
+echo "Ensure gnupg is installed, which is needed for interacting with 'apt-key'"
+<%= apt_update %>
+<%= apt_install %> gnupg
+
+echo "Install orcharhino repositories"
+mkdir -p /etc/apt/sources.list.d
+
+<% if use_trusted_gpg_d %>
+mkdir -p /etc/apt/trusted.gpg.d
+wget "http://<%= host_content_fqdn %>/pub/pulp_deb_signing.key" -O - | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/orcharhino_<%= host_content_fqdn %>.gpg --import
+chmod 644 /etc/apt/trusted.gpg.d/orcharhino_<%= host_content_fqdn %>.gpg
+<% # looks like gpg creates this file automatically and there is no option to prevent gpg to create this backup file -%>
+rm -f /etc/apt/trusted.gpg.d/orcharhino_<%= host_content_fqdn %>.gpg~
+<% else %>
+wget "http://<%= host_content_fqdn %>/pub/pulp_deb_signing.key" -O - | apt-key add -
+<% end %>
+
+  <%- if host_param('kt_activation_keys') -%>
+
+cat > /etc/apt/sources.list.d/orcharhino.list <<'EOF'
+# This File is automatically generated.
+# !!! Do not edit !!!
+
+deb <%= or_client_repo_url %> default all
+EOF
+
+<%= apt_update %>
+<%= apt_install %> apt-transport-katello katello-upload-profile
+
+echo "Remove all repositories from /etc/apt/sources.list{,.d/*}"
+cat > /etc/apt/sources.list <<'EOF'
+# This system is managed by orcharhino
+EOF
+
+find /etc/apt/sources.list.d -type f -print0 | xargs -r0 rm
+
+echo "Registering the System"
+wget --no-check-certificate -O - <%= host_content_url %>/pub/katello-rhsm-consumer | /bin/bash -x 2> /root/katello-rhsm-consumer.log
+
+<% if http_proxy %>
+  subscription-manager config --server.proxy_hostname='<%= http_proxy %>'
+  <% if http_proxy_user %>
+    subscription-manager config --server.proxy_user='<%= http_proxy_user %>'
+  <% end %>
+  <% if http_proxy_password %>
+    subscription-manager config --server.proxy_password='<%= http_proxy_password %>'
+  <% end %>
+  subscription-manager config --server.proxy_port='<%= http_proxy_port %>'
+<% end %>
+
+subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= host_param('kt_activation_keys') %>"
+
+# Update the package lists
+<%= apt_update %>
+
+# Install katello host tools and tracer
+if dpkg -l python3-subscription-manager >/dev/null 2>&1; then
+  <%= apt_install %> python3-katello-host-tools python3-katello-host-tools-tracer
+else
+  <%= apt_install %> python-katello-host-tools python-katello-host-tools-tracer
+fi
+
+<% unless host_param_false?('package_upgrade') -%>
+# update all the base packages from the updates repository
+  <%= apt_upgrade %>
+<% end -%>
+  <%- else -%>
+
+cat > /etc/apt/sources.list.d/orcharhino.list <<'EOF'
+# This File is automatically generated.
+# !!! Do not edit !!!
+<%-
+  i=1
+  while host_param('or_deb_repo_%i' % (i))
+-%>
+deb http://<%= host_content_fqdn %>/<%= host_param('or_deb_repo_%i' % (i)) %>
+<%-
+  i = i + 1
+end
+-%>
+EOF
+
+  <%- end -%>
+<%- else -%>
+echo "Warning! This should only be used on Debian OSes."
+<%- end -%>

data/app/views/provisioning_templates/temp/snippet/_or_ol_client.erb

@@ -0,0 +1,37 @@
+<%#
+kind: snippet
+name: or_ol_client
+model: ProvisioningTemplate
+snippet: true
+description: This snippet prepares the registration to orcharhino on a OracleLinux host
+-%>
+<%-
+  os_major = @host.operatingsystem.major.to_i
+
+  if !host_param('or_client_repo_url').nil?
+    or_client_repo_url = host_param('or_client_repo_url')
+  elsif !host_param('or_oraclelinux_client_repo_prefix').nil?
+    or_client_repo_url = host_param('or_oraclelinux_client_repo_prefix') + os_major.to_s
+  else
+    or_client_repo_url = nil
+  end
+%>
+<%- if !or_client_repo_url.nil? %>
+# Install dependencies which are required later on while installing the subscription-manager
+yum install -y python-inotify python-setuptools
+
+cat << EOF > /etc/yum.repos.d/or_ol_client.repo
+[orcharhino_OracleLinux_Client_<%= os_major %>]
+name=orcharhino Oracle Linux Client
+baseurl="<%= or_client_repo_url %>"
+gpgcheck=0
+enabled=1
+priority=5
+EOF
+
+<%- if os_major == 7 %>
+# Remove oracle's rhn-client-tools which blocks the installation of our subscription-manager
+yum remove -y rhn-client-tools
+<%- end %>
+
+<%- end %>

data/app/views/provisioning_templates/temp/snippet/_or_sles_client.erb

@@ -0,0 +1,85 @@
+<%#
+kind: snippet
+name: or_sles_client
+model: ProvisioningTemplate
+snippet: true
+description: this snippet will start a script to register SUSE machines with orcharhino
+%>
+<%
+  os_major = @host.operatingsystem.major.to_i
+  os_minor = @host.operatingsystem.minor.to_i
+  pm_set = @host.puppet_server.present?
+  aio_enabled = host_param_true?('enable-puppetlabs-puppet7-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-pc1-repo') || host_param_true?('enable-puppet5') || host_param_true?('enable-puppet6') || host_param_true?('enable-puppet7')
+  puppet_enabled = pm_set || host_param_true?('force-puppet')
+  use_sles_client_v2 = host_param_true?('use-sles-client-v2')
+  salt_enabled = host_param('salt_master').present?
+  sles_minor_string = (os_minor == 0) ? '' : "SP#{os_minor}"
+
+  if use_sles_client_v2
+      katello_client_tool = "katello-host-tools"
+      if os_major >= 15
+        katello_client_tool += " katello-host-tools-tracer"
+      end
+  else
+      katello_client_tool = "katello-agent"
+  end
+
+  additional_pkgs=""
+  if os_major < 12
+    additional_pkgs="libnl3"
+  end
+%>
+
+<%- if host_param('kt_activation_keys') -%>
+  <%- if @host.operatingsystem.family == 'Suse' -%>
+    echo "Installing or_sles_client repository"
+    <%- if host_param('or_sles_client_repo_prefix').nil? and host_param('or_client_repo_url').nil? -%>
+      echo "================================ Warning ============================================="
+      echo "Warning: To provision SLES clients, you need to prepare an 'or_sles_client'-repository"
+      echo "  and write it's location in the operatingsystem parameter 'or_client_repo_url'."
+      echo "================================ Warning ============================================="
+    <%- end -%>
+    <%- if host_param('or_client_repo_url').nil? -%>
+      zypper addrepo -G --check "<%= host_param('or_sles_client_repo_prefix') %><%= os_major %><%= sles_minor_string %>" or_sles_client
+    <%- else -%>
+      zypper addrepo -G --check "<%= host_param('or_client_repo_url') %>" or_sles_client
+    <%- end -%>
+    zypper -n update
+    zypper --non-interactive --no-gpg-checks --quiet install --auto-agree-with-licenses subscription-manager <%= additional_pkgs %>
+    <%- unless use_sles_client_v2 -%>
+    zypper --non-interactive --no-gpg-checks --quiet install --auto-agree-with-licenses or-sles-client
+    <%- end -%>
+
+    <%- if os_major < 12 -%>
+    curl -s <%= subscription_manager_configuration_url(@host, false) %> | bash
+    <%- else -%>
+    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_param_false?('package_upgrade') -%>
+    # update all the base packages from the updates repository
+      zypper -n update
+    <% end -%>
+    echo "Installing katello client"
+    zypper --non-interactive --no-gpg-checks --quiet install --auto-agree-with-licenses <%= katello_client_tool %>
+
+    <%- unless use_sles_client_v2 -%>
+    chkconfig goferd on
+    <%- end -%>
+    subscription-manager refresh
+
+    <% if puppet_enabled -%>
+      <% if aio_enabled -%>
+        /usr/bin/zypper -n install puppet-agent
+      <% else -%>
+        /usr/bin/zypper -n install rubygem-puppet
+      <% end -%>
+    <% end -%>
+    <% if salt_enabled -%>
+      /usr/bin/zypper -n install salt-minion
+    <% end -%>
+  <%- else -%>
+    echo "Warning! This should only be used on Suse OSes."
+  <%- end -%>
+<%- end -%>

data/lib/foreman_puppet/register.rb

@@ -227,7 +227,7 @@ Foreman::Plugin.register :foreman_puppet do
   end
   extend_page 'hosts/_list' do |context|
     context.with_profile :puppet, _('Puppet'), default: true do
-      add_pagelet :hosts_table_column_header, key: :environment, label: s_('Environment name'), sortable: true, width: '10%', class: 'hidden-xs'
+      add_pagelet :hosts_table_column_header, key: :environment, label: s_('Puppet env'), sortable: true, width: '10%', class: 'hidden-xs'
       add_pagelet :hosts_table_column_content, key: :environment, callback: ->(host) { host.environment }, class: 'hidden-xs ellipsis'
     end
   end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.1.2'.freeze
 end

data/lib/tasks/foreman_puppet_tasks.rake

@@ -1,15 +1,5 @@
 require 'rake/testtask'
 
-# Tasks
-namespace :foreman_puppet do
-  namespace :example do
-    desc 'Example Task'
-    task task: :environment do
-      # Task goes here
-    end
-  end
-end
-
 # Tests
 namespace :test do
   desc 'Test ForemanPuppet'