Fixes #22249 - Handle use_autosignfile in migrations

Katello · Jan 11, 2018 · a250535 · a250535
1 parent a7ba5e8
commit a250535
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/config/foreman-proxy-content-answers.yaml b/config/foreman-proxy-content-answers.yaml
@@ -21,6 +21,7 @@ foreman_proxy:
   foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem
   foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem
   foreman_ssl_key: /etc/foreman-proxy/foreman_ssl_key.pem
+  use_autosignfile: true
 foreman_proxy::plugin::pulp:
   enabled: false
   pulpnode_enabled: true

diff --git a/config/foreman-proxy-content.migrations/180111142132-foreman_proxy_autosignfile.rb b/config/foreman-proxy-content.migrations/180111142132-foreman_proxy_autosignfile.rb
@@ -0,0 +1,7 @@
+if answers['foreman_proxy'] && !answers['foreman_proxy']['use_autosignfile']
+  answers['foreman_proxy']['use_autosignfile'] = true
+  if answers['foreman_proxy'].key?('puppetdir')
+    puppetdir = answers['foreman_proxy']['puppetdir']
+    answers['foreman_proxy']['autosignfile'] = puppetdir + '/autosign.conf'
+  end
+end
diff --git a/config/katello-answers.yaml b/config/katello-answers.yaml
@@ -51,6 +51,7 @@ foreman_proxy:
   foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem
   foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem
   foreman_ssl_key: /etc/foreman-proxy/foreman_ssl_key.pem
+  use_autosignfile: true
 foreman_proxy::plugin::pulp:
   enabled: true
   pulpnode_enabled: false

diff --git a/config/katello-devel-answers.yaml b/config/katello-devel-answers.yaml
@@ -23,6 +23,7 @@ foreman_proxy:
   foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem
   foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem
   foreman_ssl_key: /etc/foreman-proxy/foreman_ssl_key.pem
+  use_autosignfile: true
 puppet:
   server: true
   server_environments_owner: apache

diff --git a/config/katello-devel.migrations/180111142132-foreman_proxy_autosignfile.rb b/config/katello-devel.migrations/180111142132-foreman_proxy_autosignfile.rb
@@ -0,0 +1,7 @@
+if answers['foreman_proxy'] && !answers['foreman_proxy']['use_autosignfile']
+  answers['foreman_proxy']['use_autosignfile'] = true
+  if answers['foreman_proxy'].key?('puppetdir')
+    puppetdir = answers['foreman_proxy']['puppetdir']
+    answers['foreman_proxy']['autosignfile'] = puppetdir + '/autosign.conf'
+  end
+end
diff --git a/config/katello.migrations/180111142132-foreman_proxy_autosignfile.rb b/config/katello.migrations/180111142132-foreman_proxy_autosignfile.rb
@@ -0,0 +1,7 @@
+if answers['foreman_proxy'] && !answers['foreman_proxy']['use_autosignfile']
+  answers['foreman_proxy']['use_autosignfile'] = true
+  if answers['foreman_proxy'].key?('puppetdir')
+    puppetdir = answers['foreman_proxy']['puppetdir']
+    answers['foreman_proxy']['autosignfile'] = puppetdir + '/autosign.conf'
+  end
+end