Skip to content

Refs #28901 - add setting postgresql_db_user #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehelms merged 1 commit into from
Feb 11, 2020
Merged

Refs #28901 - add setting postgresql_db_user #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/database.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
include postgresql::client
include postgresql::server
postgresql::server::db { $pulpcore::postgresql_db_name:
user => $pulpcore::user,
user => $pulpcore::postgresql_db_user,
password => postgresql_password($pulpcore::user, $pulpcore::postgresql_db_password),
before => Pulpcore::Admin['migrate --noinput'],
}
Expand Down
4 changes: 4 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
# @param postgresql_db_name
# Name of Pulp database
#
# @param postgresql_db_user
# Pulp database user
#
# @param postgresql_db_password
# Password of Pulp database
#
Expand Down Expand Up @@ -75,6 +78,7 @@
Stdlib::Port $content_port = 24816,
Stdlib::Absolutepath $webserver_static_dir = '/var/lib/pulp/docroot',
String $postgresql_db_name = 'pulpcore',
String $postgresql_db_user = 'pulp',
String $postgresql_db_password = extlib::cache_data('pulpcore_cache_data', 'db_password', extlib::random_password(32)),
Stdlib::Host $postgresql_db_host = 'localhost',
Stdlib::Port $postgresql_db_port = 5432,
Expand Down
4 changes: 3 additions & 1 deletion spec/acceptance/basic_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ class { 'postgresql::globals':
class { 'redis::globals':
scl => 'rh-redis5',
}
include pulpcore
class { 'pulpcore':
postgresql_db_user => 'pulp',
}
PUPPET
}

Expand Down
2 changes: 1 addition & 1 deletion templates/settings.py.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': '<%= scope['pulpcore::postgresql_db_name'] %>',
'USER': '<%= scope['pulpcore::user'] %>',
'USER': '<%= scope['pulpcore::postgresql_db_user'] %>',
'PASSWORD': '<%= scope['pulpcore::postgresql_db_password'] %>',
'HOST': '<%= scope['pulpcore::postgresql_db_host'] %>',
'PORT': '<%= scope['pulpcore::postgresql_db_port'] %>',
Expand Down