Refs #37325 - optional container gateway PG management

Author: ianballou

manifests/plugin/container_gateway.pp

@@ -6,6 +6,8 @@
 #
 # $database_backend::         'sqlite' or 'postgres'
 #
+# $manage_postgresql::        If the PostgreSQL database should be managed
+#
 # $postgresql_host::          Host of the postgres database.
 #
 # $postgresql_port::          Port of the postgres database.
@@ -37,6 +39,7 @@
   String $database_backend = 'postgres',
   Stdlib::Absolutepath $sqlite_db_path = '/var/lib/foreman-proxy/smart_proxy_container_gateway.db',
   Optional[Integer] $sqlite_timeout = undef,
+  Boolean $manage_postgresql = true,
   Stdlib::Host $postgresql_host = 'localhost',
   Stdlib::Port $postgresql_port = 5432,
   String $postgresql_database = 'container_gateway',
@@ -49,15 +52,18 @@
     feature   => 'Container_Gateway',
     listen_on => $listen_on,
   }
-  include postgresql::server
-  postgresql::server::db { $foreman_proxy::plugin::container_gateway::postgresql_database:
-    user     => $foreman_proxy::plugin::container_gateway::postgresql_user,
-    password => postgresql::postgresql_password(
-      $foreman_proxy::plugin::container_gateway::postgresql_user,
-      $foreman_proxy::plugin::container_gateway::postgresql_password
-    ),
-    encoding => 'utf8',
-    locale   => 'en_US.utf8',
-    require  => Package['glibc-langpack-en'],
+
+  if $foreman_proxy::plugin::container_gateway::manage_postgresql {
+    include postgresql::server
+    postgresql::server::db { $foreman_proxy::plugin::container_gateway::postgresql_database:
+      user     => $foreman_proxy::plugin::container_gateway::postgresql_user,
+      password => postgresql::postgresql_password(
+        $foreman_proxy::plugin::container_gateway::postgresql_user,
+        $foreman_proxy::plugin::container_gateway::postgresql_password
+      ),
+      encoding => 'utf8',
+      locale   => 'en_US.utf8',
+      require  => Package['glibc-langpack-en'],
+    }
   }
 }

spec/classes/foreman_proxy__plugin__container_gateway_spec.rb

@@ -15,12 +15,8 @@
             ':enabled: https',
             ":pulp_endpoint: https://#{facts[:fqdn]}",
             ':database_backend: postgresql',
-            ':postgresql_host: localhost',
-            ':postgresql_port: 5432',
-            ':postgresql_database: container_gateway',
-            ':postgresql_user: foreman-proxy',
-            ':postgresql_password: changeme',
-            ':sqlite_db_path: /var/lib/foreman-proxy/smart_proxy_container_gateway.db'
+            ':sqlite_db_path: /var/lib/foreman-proxy/smart_proxy_container_gateway.db',
+            ':postgresql_connection_string: postgres://foreman-proxy:changeme@localhost:5432/container_gateway'
           ])
         end
       end
@@ -46,11 +42,7 @@
             ':database_backend: postgresql',
             ':sqlite_db_path: /dev/null.db',
             ':sqlite_timeout: 12345',
-            ':postgresql_host: test.example.com',
-            ':postgresql_port: 5432',
-            ':postgresql_database: container_gateway',
-            ':postgresql_user: foreman-proxy',
-            ':postgresql_password: changeme'
+            ':postgresql_connection_string: postgres://foreman-proxy:[email protected]:5432/container_gateway'
           ])
         end
       end

templates/plugin/container_gateway.yml.erb

@@ -13,8 +13,4 @@
   "#{scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_host")}:" \
   "#{scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_port")}/" \
   "#{scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_database")}"
-  %>
-:postgresql_host: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_host") %>
-:postgresql_port: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_port") %>
-:postgresql_user: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_user") %>
-:postgresql_password: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::postgresql_password") %>
+  %>