Katello 3.12.2

packages/katello/katello-repos/katello-repos.spec

@@ -9,7 +9,7 @@
 %global release 1
 
 Name:           katello-repos
-Version:        3.12.1
+Version:        3.12.2
 Release:        %{?prerelease:0.}%{release}%{?prerelease}%{?dist}
 Summary:        Definition of yum repositories for Katello
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-katello
 
 %changelog
+* Thu Aug 08 2019 Evgeni Golov - 3.12.2-1
+- Release 3.12.2
+
 * Wed Jul 17 2019 Evgeni Golov - 3.12.1-1
 - Release 3.12.1
 

packages/katello/katello/hostname-change.rb

@@ -63,7 +63,7 @@ def check_for_certs_tar
     def get_fpc_answers
       register_in_foreman = false
       certs_tar = @options[:certs_tar]
-      " --foreman-proxy-register-in-foreman #{register_in_foreman} --foreman-proxy-content-certs-tar #{certs_tar}"
+      " --foreman-proxy-register-in-foreman #{register_in_foreman} --certs-tar-file #{certs_tar}"
     end
 
     def precheck
@@ -167,6 +167,12 @@ def using_custom_certs?(scenario_answers)
       scenario_answers["certs"]["server_cert_req"]
     end
 
+    def delete_puppet_certs
+      puppet_ssldir = @scenario_answers['puppet']['ssldir']
+
+      run_cmd("rm -rf '#{puppet_ssldir}'")
+    end
+
     def all_custom_cert_options_present?
       @options[:custom_cert] && @options[:custom_key] && @options[:custom_cert_req]
     end
@@ -335,6 +341,8 @@ def run
         self.run_cmd("rm -rf #{@scenario_answers["foreman"]["client_ssl_key"]}")
       end
 
+      delete_puppet_certs
+
       STDOUT.puts "backed up #{public_dir} to #{public_backup_dir}"
       STDOUT.puts "updating hostname in /etc/hosts"
       self.run_cmd("sed -i -e 's/#{@old_hostname}/#{@new_hostname}/g' /etc/hosts")

packages/katello/katello/katello.spec

@@ -7,7 +7,7 @@
 %global release 1
 
 Name:       katello
-Version:    3.12.1
+Version:    3.12.2
 Release:    %{?prerelease:0.}%{release}%{?prerelease}%{?dist}
 Summary:    A package for managing application life-cycle for Linux systems
 BuildArch:  noarch
@@ -194,6 +194,11 @@ Useful utilities for managing Katello services
 %{_sysconfdir}/bash_completion.d/katello-service
 
 %changelog
+* Thu Aug 08 2019 Evgeni Golov - 3.12.2-1
+- Release 3.12.2
+- katello-change-hostname: clean puppet certs
+- katello-change-hostname: s/foreman-proxy-content-certs-tar/certs-tar-file/
+
 * Wed Jul 17 2019 Evgeni Golov - 3.12.1-1
 - Release 3.12.1
 

packages/katello/rubygem-katello/katello-3.12.2.gem

@@ -0,0 +1 @@
+../../../.git/annex/objects/1q/v2/SHA256E-s3260416--bd8124e8f6dd4bbecb4f6b2fcc6263feea42c9672bda29698b60859af09de27f.2.gem/SHA256E-s3260416--bd8124e8f6dd4bbecb4f6b2fcc6263feea42c9672bda29698b60859af09de27f.2.gem

packages/katello/rubygem-katello/rubygem-katello.spec

@@ -5,7 +5,7 @@
 %global plugin_name katello
 %global gem_name katello
 #global prerelease .rc2
-%global mainver 3.12.1
+%global mainver 3.12.2
 %global release 1
 
 Name:    %{?scl_prefix}rubygem-%{gem_name}
@@ -368,6 +368,9 @@ cp -pa .%{gem_dir}/* \
 %{gem_instdir}/webpack
 
 %changelog
+* Thu Aug 08 2019 Evgeni Golov - 3.12.2-1
+- Release 3.12.2
+
 * Wed Jul 17 2019 Evgeni Golov - 3.12.1-1
 - Release 3.12.1