refs #15058 - revert mongo auth

theforeman · Jun 7, 2016 · af27e1b · af27e1b
1 parent e6c9d06
commit af27e1b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -46,10 +46,6 @@
 #
 # $repo_export_dir::    Directory to create for repository exports
 #
-# $pulp_db_username::   Username for the pulp database
-#
-# $pulp_db_password::   Password for the pulp database
-#
 class katello (
 
   $user = $katello::params::user,
@@ -77,9 +73,6 @@
   $max_keep_alive = $katello::params::max_keep_alive,
 
   $repo_export_dir = $katello::params::repo_export_dir,
-
-  $pulp_db_username = $katello::params::pulp_db_username,
-  $pulp_db_password = $katello::params::pulp_db_password,
   ) inherits katello::params {
   validate_bool($enable_ostree)
   validate_integer($max_keep_alive)
@@ -143,8 +136,6 @@
     num_workers            => $num_pulp_workers,
     enable_parent_node     => false,
     repo_auth              => true,
-    db_username            => $pulp_db_username,
-    db_password            => $pulp_db_password,
   } ~>
   class { '::qpid::client':
     ssl                    => true,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -32,9 +32,6 @@
 
   $num_pulp_workers = min($::processorcount, 8)
 
-  $pulp_db_username = 'pulp'
-  $pulp_db_password = cache_data('foreman_cache_data', 'pulp_db_password', random_password(32))
-
   # cdn ssl settings
   $cdn_ssl_version = undef
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "katello-katello",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "author": "Katello",
   "summary": "Handles deploying and managing a Katello + Foreman server",
   "license": "GPL-3.0+",