foreman_puppet 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bb32ba667a6cad7d45b0f986f3069761f4ac9585ac712b31753e1dfdbedb3df
-  data.tar.gz: d4357cbf1e9fb01d38cd481c03c31665de2111c664d2b6bb5c79b3623cede524
+  metadata.gz: cd8fd7cb3c5cba9fcc4687c4cf5d283c5bf7dbb9710daf3a103e77920caae6dd
+  data.tar.gz: 7da5ff9d5fcb48da2dc4a8c0aab53723cdd3a0d50cc70a92208679999cdd2e00
 SHA512:
-  metadata.gz: 13149fb7c821ff36f35f072fc99114cc04d7d8cd6887bb7a8d3613d4c956f6ac3ec04900039f4f2e698f2b71e2cacf2d9e91f34a0ecc0ce36f3232f814adeb7f
-  data.tar.gz: fc448f84b1bce197fded691804679dead4c27fdf952bdcd586b9f15f08db90252dfb50fe13157c0aab3682c7feb310b31a0c43c3a7b4ea18e7a565f45bc3de4d
+  metadata.gz: 3c098607d4b7e3ac1a57624d74e004f70f8df8d706acbee598c02451d2795d2a055ea93e2fdf243e72c9421b1748c925df94e4ada0b3f1af9296d6543abe53bd
+  data.tar.gz: c436c2bdabcf5ed80dcc137c86119f6d72a854711c0bc9e4c21e3573633246d2f50cdc53291ea6e0e68c1ee54edabaeb41d31366c1c0d1aea7d964c5e3573fff

data/app/models/concerns/foreman_puppet/extensions/host.rb

@@ -30,7 +30,7 @@ module ForemanPuppet
         def search_by_puppetclass(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
           config_group_ids = ForemanPuppet::ConfigGroup.joins(:puppetclasses).where(conditions).pluck(:id)
-          host_ids         = ::Host.authorized(:view_hosts, Host).joins(puppet: :puppetclasses).where(conditions).distinct.pluck(:id)
+          host_ids         = ::Host.authorized(:view_hosts).joins(puppet: :puppetclasses).where(conditions).distinct.pluck(:id)
           host_ids        += ForemanPuppet::HostConfigGroup
                              .where(host_type: 'ForemanPuppet::HostPuppetFacet')
                              .where(config_group_id: config_group_ids)

data/app/views/foreman_puppet/environments/welcome.html.erb

@@ -1,4 +1,9 @@
 <% content_for(:title, _("Puppet environments")) %>
+<%= breadcrumbs(:switchable => false,
+                :items => [
+                  { :caption => _('Puppet Environments'), :url => environments_path },
+                  { caption: @page_header }
+                ]) %>
 
 <%= webpacked_plugins_js_for :foreman_puppet %>
 <%= react_component('WelcomeEnv', {canCreate: authorized_for(action: :new)}) %>

data/app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb

@@ -7,5 +7,5 @@
                                     :iconType => 'fa',
                                     :header => _('Smart Class Parameters'),
                                     :description => description,
-                                    :documentation => { :url => documentation_url("4.2.5ParameterizedClasses") },
+                                    :documentation => { :url => documentation_url("4.2.5SmartMatchers") },
                                   }) %>

data/app/views/foreman_puppet/puppetclasses/_selected_classes.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag :li, id: "selected_puppetclass_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(@environment))] do %>
+<%= content_tag :li, id: "selected_puppetclass_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(obj.environment.present? ? obj.environment : @environment))] do %>
   <%= link_to_remove_puppetclass(klass, obj) %>
   <%= hidden_field_tag "#{resource_type}[puppetclass_ids][]", klass.id %>
 <% end %>

data/app/views/hosts/select_multiple_puppet_proxy.html.erb

@@ -0,0 +1,5 @@
+<%= render 'selected_hosts', :hosts => @hosts %>
+
+<%= form_for :proxy, :url => foreman_puppet.update_multiple_puppet_proxy_hosts_path(:host_ids => params[:host_ids]) do |f| %>
+  <%= multiple_proxy_select(f, 'Puppet') %>
+<% end %>

data/app/views/provisioning_templates/temp/autoyast_orcharhino_finish.erb

@@ -0,0 +1,31 @@
+<%#
+kind: finish
+name: AutoYaST orcharhino finish
+model: ProvisioningTemplate
+oses:
+- SLES
+-%>
+<%
+  pm_set = @host.puppet_server.present?
+  puppet_enabled = pm_set || host_param_true?('force-puppet')
+  salt_enabled = host_param('salt_master').present?
+-%>
+
+/usr/bin/hostnamectl set-hostname <%= @host.name %>
+
+<%= snippet 'or_sles_client' %>
+
+<%= snippet('remote_execution_ssh_keys') %>
+
+<%= snippet "blacklist_kernel_modules" %>
+
+<% if puppet_enabled -%>
+<%= snippet 'puppet_setup' %>
+<% end -%>
+
+<% if salt_enabled %>
+<%= snippet 'saltstack_setup' %>
+<% end -%>
+
+<%= snippet 'eject_cdrom' -%>
+<%= snippet 'built' %>

data/app/views/provisioning_templates/temp/preseed_orcharhino_finish.erb

@@ -0,0 +1,90 @@
+<%#
+kind: finish
+name: Preseed orcharhino finish
+model: ProvisioningTemplate
+oses:
+- Debian
+- Ubuntu
+%>
+
+export DEBIAN_FRONTEND=noninteractive
+
+<% if @host.provision_method == 'image' -%>
+<%# Cloud instances frequently have incorrect hosts data %>
+<%= snippet 'fix_hosts' %>
+<% end -%>
+
+<% if @host.operatingsystem.name == "Ubuntu" && @host.operatingsystem.major.to_i > 20 || (@host.operatingsystem.major.to_i == 20 && @host.operatingsystem.minor.to_i >= 3) -%>
+<%# Set hostname for Ubuntu Autoinstall %>
+hostnamectl set-hostname <%= @host.name %>
+<% end -%>
+
+<%
+  pm_set = @host.puppet_server.present?
+  puppet_enabled = pm_set || host_param_true?('force-puppet')
+  salt_enabled = host_param('salt_master').present?
+  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
+  apt_install = 'apt -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y install'
+%>
+
+<% subnet = @host.subnet -%>
+<% if subnet.respond_to?(:dhcp_boot_mode?) -%>
+<% dhcp = subnet.dhcp_boot_mode? && !@static -%>
+<% else -%>
+<% dhcp = !@static -%>
+<% end -%>
+<%= snippet_if_exists(template_name + " custom pre") -%>
+<% unless dhcp -%>
+# host and domain name need setting as these values may have come from dhcp if pxe booting
+/bin/sed -i "s/^search.*$/search <%= @host.domain %>/g" /etc/resolv.conf
+/bin/sed -i "s/.*dns-search.*/\tdns-search <%= @host.domain %>/g" /etc/network/interfaces
+/bin/sed -i "s/^<%= @host.ip %>.*/<%= @host.ip %>\t<%= @host.shortname %>.<%= @host.domain %>\t<%= @host.shortname %>/g" /etc/hosts
+/bin/echo <%= @host.shortname %> > /etc/hostname
+/bin/hostname  <%= @host.shortname %>.<%= @host.domain %>
+<% end -%>
+
+<%= snippet_if_exists(template_name + " custom snippet") %>
+<% if host_enc['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
+<%= snippet 'freeipa_register' %>
+<% end -%>
+
+<%= snippet 'or_deb_client' %>
+
+<%= snippet('remote_execution_ssh_keys') %>
+
+<%= snippet "blacklist_kernel_modules" %>
+
+<%= snippet_if_exists(template_name + " custom post") -%>
+
+<% unless host_param('kernel_parameters').nil? -%>
+# Allow overriding the default kernel parameters
+  sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT=".*"/GRUB_CMDLINE_LINUX_DEFAULT="<%= host_param('kernel_parameters') %>"/g' /etc/default/grub && update-grub
+
+<% end -%>
+<% if chef_enabled %>
+<%= snippet 'chef_client' %>
+<% end -%>
+
+<% if puppet_enabled %>
+<% if @host.operatingsystem.name != "Ubuntu" %>
+<% if host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppetlabs-puppet5-repo') -%>
+<%= snippet 'puppetlabs_repo' %>
+<% end -%>
+<% end -%>
+<%= snippet 'puppet_setup' %>
+<% end -%>
+
+<% if salt_enabled %>
+<%= snippet 'saltstack_setup' %>
+<% end -%>
+
+<%= snippet 'preseed_networking_setup' %>
+<%= snippet 'efibootmgr_netboot' %>
+
+<%= apt_install %> openssh-client
+sed -i -e "/PermitRootLogin/d" /etc/ssh/sshd_config
+echo "PermitRootLogin Yes" >> /etc/ssh/sshd_config
+systemctl restart sshd
+
+<%= snippet 'eject_cdrom' -%>
+<%= snippet 'built' %>

data/app/views/provisioning_templates/temp/provision/autoyast_orcharhino_default.erb

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<%#
+kind: provision
+name: AutoYaST orcharhino default
+model: ProvisioningTemplate
+oses:
+- SLES
+-%>
+<%
+  os_major = @host.operatingsystem.major.to_i
+  os_minor = @host.operatingsystem.minor.to_i
+  pm_set = @host.puppet_server.present?
+  puppet_enabled = pm_set || host_param_true?('force-puppet')
+  salt_enabled = host_param('salt_master').present?
+
+  primary_interface_identifier = @host.primary_interface.identifier.blank? ? 'eth0' : @host.primary_interface.identifier
+  primary_interface_subnet = @host.primary_interface.subnet
+-%>
+<!DOCTYPE profile>
+<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+  <general>
+    <mode>
+      <confirm config:type="boolean">false</confirm>
+      <final_reboot config:type="boolean">true</final_reboot>
+    </mode>
+  </general>
+  <networking>
+    <dns>
+      <hostname><%= @host.name %></hostname>
+<% unless primary_interface_subnet.dhcp_boot_mode? -%>
+      <dhcp_hostname config:type="boolean">false</dhcp_hostname>
+<% if os_major < 12 -%>
+      <dhcp_resolv config:type="boolean">false</dhcp_resolv>
+<% end -%>
+<% if @host.domain -%>
+      <domain><%= @host.domain -%></domain>
+<% end -%>
+<% if primary_interface_subnet.dns_primary.present? -%>
+      <nameservers config:type="list">
+        <nameserver><%= primary_interface_subnet.dns_primary -%></nameserver>
+<% if primary_interface_subnet.dns_secondary.present? -%>
+        <nameserver><%= primary_interface_subnet.dns_secondary -%></nameserver>
+<% end -%>
+      </nameservers>
+<% end -%>
+<% else -%>
+      <resolv_conf_policy>auto</resolv_conf_policy>
+<% end -%>
+<% if @host.domain -%>
+      <searchlist config:type="list">
+        <search><%= @host.domain %></search>
+      </searchlist>
+<% end -%>
+    </dns>
+    <interfaces config:type="list">
+<%
+  @host.managed_interfaces.each do |interface|
+    next if !interface.managed? || interface.subnet.nil? || interface.ip.nil?
+    dhcp = interface.subnet.dhcp_boot_mode?
+-%>
+<% if dhcp -%>
+      <interface>
+        <bootproto>dhcp</bootproto>
+        <device><%= interface.primary ? primary_interface_identifier : interface.identifier -%></device>
+        <startmode>auto</startmode>
+        <usercontrol>no</usercontrol>
+      </interface>
+<% else -%>
+      <interface>
+        <bootproto>static</bootproto>
+        <device><%= interface.primary ? primary_interface_identifier : interface.identifier -%></device>
+        <ipaddr><%= interface.ip -%></ipaddr>
+        <netmask><%= interface.subnet.mask -%></netmask>
+        <startmode>onboot</startmode>
+        <usercontrol>no</usercontrol>
+      </interface>
+<% end -%>
+<% end -%>
+    </interfaces>
+<% unless primary_interface_subnet.dhcp_boot_mode? -%>
+    <routing>
+      <routes config:type="list">
+        <route>
+          <destination>default</destination>
+          <device><%= primary_interface_identifier -%></device>
+          <gateway><%= primary_interface_subnet.gateway -%></gateway>
+          <netmask><%= primary_interface_subnet.mask -%></netmask>
+        </route>
+      </routes>
+    </routing>
+<% end -%>
+  </networking>
+<% if host_param('http-proxy') -%>
+  <proxy>
+    <enabled config:type="boolean">true</enabled>
+    <http_proxy>http://<%= host_param('http-proxy') %>:<%= host_param('http-proxy-port') %></http_proxy>
+    <https_proxy>http://<%= host_param('http-proxy') %>:<%= host_param('http-proxy-port') %></https_proxy>
+    <% if host_param('noproxy') -%>
+    <no_proxy>localhost 127.0.0.1 <%= host_param('http-proxy') %> <%= host_param('noproxy') %></no_proxy>
+    <% else -%>
+    <no_proxy>localhost 127.0.0.1 <%= host_param('http-proxy') %></no_proxy>
+    <% end -%>
+  </proxy>
+<% end -%>
+<% if os_major >= 15 -%>
+  <ntp-client>
+    <ntp_policy>auto</ntp_policy>
+    <ntp_servers config:type="list">
+      <ntp_server>
+        <address><%= host_param('ntp-server') || '0.opensuse.pool.ntp.org' %></address>
+        <iburst config:type="boolean">false</iburst>
+        <offline config:type="boolean">true</offline>
+      </ntp_server>
+    </ntp_servers>
+    <ntp_sync>15</ntp_sync>
+  </ntp-client>
+<% else -%>
+  <ntp-client>
+    <configure_dhcp config:type="boolean">false</configure_dhcp>
+    <peers config:type="list">
+      <peer>
+        <address><%= host_param('ntp-server') || '0.opensuse.pool.ntp.org' %></address>
+        <initial_sync config:type="boolean">true</initial_sync>
+        <options></options>
+        <type>server</type>
+      </peer>
+    </peers>
+    <start_at_boot config:type="boolean">true</start_at_boot>
+    <start_in_chroot config:type="boolean">true</start_in_chroot>
+  </ntp-client>
+<% end -%>
+<% if ! @dynamic -%>
+  <%= @host.diskLayout %>
+<% end -%>
+<% if os_major >= 15 -%>
+  <services-manager>
+  <default_target>multi-user</default_target>
+  <services>
+    <enable config:type="list">
+      <service>sshd</service>
+    </enable>
+  </services>
+  </services-manager>
+<% else -%>
+  <runlevel>
+    <default>3</default>
+    <services config:type="list">
+      <service>
+        <service_name>sshd</service_name>
+        <service_status>enable</service_status>
+      </service>
+    </services>
+  </runlevel>
+<% end -%>
+  <software>
+<% if os_major >= 15 -%>
+    <products config:type="list">
+      <product>SLES</product>
+    </products>
+    <patterns config:type="list">
+      <pattern>enhanced_base</pattern>
+    </patterns>
+<% else -%>
+    <patterns config:type="list">
+      <pattern>base</pattern>
+<% if os_major >= 14 -%>
+      <pattern>enhanced_base</pattern>
+      <pattern>sw_management</pattern>
+      <pattern>yast2_basis</pattern>
+<% end -%>
+    </patterns>
+<% end -%>
+    <packages config:type="list">
+      <package>lsb-release</package>
+      <package>openssh</package>
+    </packages>
+  </software>
+<% if host_param('http-proxy') -%>
+  <sysconfig config:type="list" >
+    <sysconfig_entry>
+      <sysconfig_key>PROXY_ENABLED</sysconfig_key>
+      <sysconfig_path>/etc/sysconfig/proxy</sysconfig_path>
+      <sysconfig_value>yes</sysconfig_value>
+    </sysconfig_entry>
+    <sysconfig_entry>
+      <sysconfig_key>HTTPS_PROXY</sysconfig_key>
+      <sysconfig_path>/etc/sysconfig/proxy</sysconfig_path>
+      <sysconfig_value>http://<%= host_param('http-proxy') %>:<%= host_param('http-proxy-port') %></sysconfig_value>
+    </sysconfig_entry>
+    <sysconfig_entry>
+      <sysconfig_key>HTTP_PROXY</sysconfig_key>
+      <sysconfig_path>/etc/sysconfig/proxy</sysconfig_path>
+      <sysconfig_value>http://<%= host_param('http-proxy') %>:<%= host_param('http-proxy-port') %></sysconfig_value>
+    </sysconfig_entry>
+    <sysconfig_entry>
+      <sysconfig_key>GOPHER_PROXY</sysconfig_key>
+      <sysconfig_path>/etc/sysconfig/proxy</sysconfig_path>
+      <sysconfig_value>http://<%= host_param('http-proxy') %>:3128</sysconfig_value>
+    </sysconfig_entry>
+    <sysconfig_entry>
+      <sysconfig_key>NO_PROXY</sysconfig_key>
+      <sysconfig_path>/etc/sysconfig/proxy</sysconfig_path>
+    <% if host_param('noproxy') -%>
+      <sysconfig_value>localhost, 127.0.0.1, <%= host_param('http-proxy') %>, <%= host_param('noproxy').split(' ').join(', ') %></sysconfig_value>
+    <% else -%>
+      <sysconfig_value>localhost, 127.0.0.1 </sysconfig_value>
+    <% end -%>
+    </sysconfig_entry>
+  </sysconfig>
+<% end -%>
+  <users config:type="list">
+    <user>
+      <username>root</username>
+      <encrypted config:type="boolean">true</encrypted>
+      <fullname>root</fullname>
+      <gid>0</gid>
+      <home>/root</home>
+      <shell>/bin/bash</shell>
+      <uid>0</uid>
+      <user_password><%= root_pass %></user_password>
+    </user>
+  </users>
+  <scripts>
+<% if @dynamic -%>
+    <pre-scripts config:type="list">
+      <script>
+        <debug config:type="boolean">true</debug>
+        <filename>pre_disklayout</filename>
+        <interpreter>shell</interpreter>
+        <source><![CDATA[
+<%= @host.diskLayout %>
+]]>
+        </source>
+      </script>
+    </pre-scripts>
+<% end -%>
+    <chroot-scripts config:type="list">
+      <script>
+        <filename>cp-resolv.sh</filename>
+        <chrooted config:type="boolean">false</chrooted>
+        <interpreter>shell</interpreter>
+        <notification>Copying resolv.conf into chroot ...</notification>
+        <source><![CDATA[
+cp /etc/resolv.conf /mnt/etc
+]]>
+        </source>
+      </script>
+      <script>
+        <filename>foreman.sh</filename>
+        <chrooted config:type="boolean">true</chrooted>
+        <interpreter>shell</interpreter>
+        <notification>Setting up Foreman ...</notification>
+        <source><![CDATA[
+/bin/hostname <%= @host.name %>
+
+<%= snippet 'eject_cdrom' -%>
+<%= snippet 'built' %>
+
+rm /etc/resolv.conf
+]]>
+        </source>
+      </script>
+    </chroot-scripts>
+
+    <init-scripts config:type="list">
+      <script>
+        <filename>post-foreman.sh</filename>
+        <source><![CDATA[
+
+<% if host_param('http-proxy') -%>
+export http_proxy="http://<%= host_param('http-proxy') %>:<%= host_param('http-proxy-port') %>"
+<% if host_param('noproxy') -%>
+export no_proxy="<%= host_param('http-proxy') %> <%= host_param('noproxy') %>"
+<% end -%>
+<% end -%>
+
+<%= snippet 'or_sles_client' %>
+
+<%= snippet('remote_execution_ssh_keys') %>
+
+<%= snippet "blacklist_kernel_modules" %>
+
+<% if puppet_enabled -%>
+<%= snippet 'puppet_setup' %>
+<% end -%>
+
+<% if salt_enabled %>
+<%= snippet 'saltstack_setup' %>
+<% end -%>
+]]>
+        </source>
+      </script>
+    </init-scripts>
+  </scripts>
+<% if os_major >= 15 -%>
+  <firewall>
+    <enable_firewall config:type="boolean">true</enable_firewall>
+    <log_denied_packets>off</log_denied_packets>
+    <default_zone>public</default_zone>
+    <zones config:type="list">
+      <zone>
+        <name>public</name>
+        <services config:type="list">
+          <service>ssh</service>
+          <service>dhcpv6-client</service>
+        </services>
+      </zone>
+    </zones>
+  </firewall>
+<% end -%>
+  <keyboard>
+    <keymap>english-us</keymap>
+  </keyboard>
+  <timezone>
+    <hwclock>UTC</hwclock>
+    <timezone><%= host_param('time-zone') || 'Etc/UTC' %></timezone>
+  </timezone>
+  <add-on>
+    <add_on_products config:type="list">
+<% if os_major >= 15 -%>
+      <listentry>
+        <media_url><%= host_param('sle-module-basesystem-url') %></media_url>
+        <product_dir>/Module-Basesystem</product_dir>
+        <product>sle-module-basesystem</product>
+      </listentry>
+  <% if os_minor >= 1 and os_minor < 4 -%>
+      <listentry>
+        <media_url><%= host_param('sle-module-basesystem-url') %></media_url>
+        <product_dir>/Module-Python2</product_dir>
+        <product>sle-module-python2</product>
+      </listentry>
+  <% end -%>
+<% end -%>
+    </add_on_products>
+  </add-on>
+</profile>

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

@@ -0,0 +1,32 @@
+<%#
+kind: snippet
+name: or_al_client
+model: ProvisioningTemplate
+snippet: true
+description: This snippet prepares the registration to orcharhino on a Amazon Linux 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_amazonlinux_client_repo_prefix').nil?
+    or_client_repo_url = host_param('or_amazonlinux_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_al_client.repo
+[orcharhino_AmazonLinux_Client_<%= os_major %>]
+name=orcharhino Amazon Linux Client
+baseurl="<%= or_client_repo_url %>"
+gpgcheck=0
+enabled=1
+priority=5
+EOF
+
+<%- end %>