Merge pull request #31 from stbenjam/9093

fixes #8991 - configure templates proxy
theforeman · Jan 28, 2015 · f1f98cf · f1f98cf
2 parents f527021 + e989027
commit f1f98cf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 7 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -19,7 +19,13 @@
 #
 # $pulp_oauth_secret::              OAuth secret to be used for Pulp REST interaction
 #
-# $foreman_proxy_port::             Port on which will foreman proxy listen
+# $foreman_proxy_port::             SSL port on which foreman proxy will listen
+#                                   type:integer
+#
+# $foreman_proxy_http::             Foreman proxy listen on HTTP
+#                                   type:boolean
+#
+# $foreman_proxy_http_port::        HTTP port on which foreman proxy will listen
 #                                   type:integer
 #
 # $puppet::                         Use puppet
@@ -127,6 +133,9 @@
 #
 # $rhsm_url::                       The URL that the RHSM API is rooted at
 #
+# $templates::                      Enable templates proxying feature
+#                                   type:boolean
+#
 class capsule (
   $parent_fqdn                   = $capsule::params::parent_fqdn,
   $certs_tar                     = $capsule::params::certs_tar,
@@ -138,6 +147,8 @@
   $pulp_oauth_secret             = $capsule::params::pulp_oauth_secret,
 
   $foreman_proxy_port            = $capsule::params::foreman_proxy_port,
+  $foreman_proxy_http            = $capsule::params::foreman_proxy_http,
+  $foreman_proxy_http_port       = $capsule::params::foreman_proxy_http_port,
 
   $puppet                        = $capsule::params::puppet,
   $puppetca                      = $capsule::params::puppetca,
@@ -192,6 +203,7 @@
 
   $rhsm_url                      = $capsule::params::rhsm_url,
 
+  $templates                     = $capsule::params::templates,
   ) inherits capsule::params {
 
   validate_present($capsule::parent_fqdn)
@@ -215,10 +227,16 @@
 
   if $pulp_master or $pulp {
     foreman_proxy::settings_file { 'pulp':
-      template_path  => 'capsule/pulp.yml'
+      enabled       => $pulp_master,
+      listen_on     => 'https',
+      template_path => 'capsule/pulp.yml',
+
     }
+
     foreman_proxy::settings_file { 'pulpnode':
-      template_path => 'capsule/pulpnode.yml'
+      enabled       => $pulp,
+      listen_on     => 'https',
+      template_path => 'capsule/pulpnode.yml',
     }
   }
 
@@ -235,7 +253,9 @@
 
   class { 'foreman_proxy':
     custom_repo           => true,
-    port                  => $foreman_proxy_port,
+    http                  => $foreman_proxy_http,
+    http_port             => $foreman_proxy_http_port,
+    ssl_port              => $foreman_proxy_port,
     puppetca              => $puppetca,
     ssl_cert              => $::certs::foreman_proxy::proxy_cert,
     ssl_key               => $::certs::foreman_proxy::proxy_key,
@@ -283,6 +303,7 @@
     oauth_effective_user  => $foreman_oauth_effective_user,
     oauth_consumer_key    => $foreman_oauth_key,
     oauth_consumer_secret => $foreman_oauth_secret,
+    templates             => $templates,
   }
 
   if $pulp or $reverse_proxy_real {

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -26,6 +26,10 @@
   $puppet_ca_proxy               = ''
 
   $foreman_proxy_port            = '9090'
+
+  $foreman_proxy_http            = true
+  $foreman_proxy_http_port       = '8000'
+
   $tftp                          = false
   $tftp_servername               = $foreman_proxy::params::tftp_servername
   $tftp_syslinux_files           = $foreman_proxy::params::tftp_syslinux_files
@@ -67,6 +71,9 @@
   $realm_principal               = $foreman_proxy::params::realm_principal
   $freeipa_remove_dns            = $foreman_proxy::params::freeipa_remove_dns
 
+  # Templates proxy
+  $templates                     = false
+
   $register_in_foreman = false
   $certs_tar = undef
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "katello-capsule",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "author": "Katello",
   "summary": "Deploys and manages a Capsule",
   "license": "GPLv3+",
@@ -25,11 +25,11 @@
     },
     {
        "name": "theforeman-foreman",
-       "version_requirement": ">= 1.5.0"
+       "version_requirement": ">= 2.3.0"
     },
     {
        "name": "theforeman-foreman_proxy",
-       "version_requirement": ">= 1.5.0"
+       "version_requirement": ">= 2.2.0"
     },
     {
        "name": "katello-common",