opendev/system-config
Code Issues Proposed changes

Update and normalize OpenStackID dev DB creds

Browse Source 
* manifests/site.pp: Start using hiera for openstackid-dev's
id_mysql_user parameter for consistency.

* modules/openstack_project/manifests/openstackid_dev.pp: TipIt is
moving the openstackid-dev server to new Trove databases, so update
the database names accordingly. Also null out the lingering default
values which we're filling from hiera in site.pp.

Change-Id: Id1b3b17751a34d3e760a789bf23c3ebea9c8c606
This commit is contained in:
Jeremy Stanley 2014-08-11 18:49:35 +00:00
parent 05dd5c9e92
commit aef7867cc0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -619,6 +619,7 @@ node 'openstackid-dev.openstack.org' {
site_admin_password => hiera('openstackid_dev_site_admin_password', 'XXX'), site_admin_password => hiera('openstackid_dev_site_admin_password', 'XXX'),
id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'), id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'),
id_mysql_password => hiera('openstackid_dev_id_mysql_password', 'XXX'), id_mysql_password => hiera('openstackid_dev_id_mysql_password', 'XXX'),
id_mysql_user => hiera('openstackid_dev_id_mysql_user', 'username'),
ss_mysql_host => hiera('openstackid_dev_ss_mysql_host', 'localhost'), ss_mysql_host => hiera('openstackid_dev_ss_mysql_host', 'localhost'),
ss_mysql_password => hiera('openstackid_dev_ss_mysql_password', 'XXX'), ss_mysql_password => hiera('openstackid_dev_ss_mysql_password', 'XXX'),
ss_mysql_user => hiera('openstackid_dev_ss_mysql_user', 'username'), ss_mysql_user => hiera('openstackid_dev_ss_mysql_user', 'username'),

8
modules/openstack_project/manifests/openstackid_dev.pp
View File

@ -18,13 +18,13 @@ class openstack_project::openstackid_dev (
$sysadmins = [], $sysadmins = [],
$site_admin_password = '', $site_admin_password = '',
$id_mysql_host = '', $id_mysql_host = '',
$id_mysql_user = 'openstackid', $id_mysql_user = '',
$id_mysql_password = '', $id_mysql_password = '',
$id_db_name = 'openstackid_openid_dev', $id_db_name = 'openstackid_dev',
$ss_mysql_host = '', $ss_mysql_host = '',
$ss_mysql_user = 'openstackid', $ss_mysql_user = '',
$ss_mysql_password = '', $ss_mysql_password = '',
$ss_db_name = 'openstackid_silverstripe_dev', $ss_db_name = 'os_dev',
$redis_port = '6378', $redis_port = '6378',
$redis_max_memory = '1gb', $redis_max_memory = '1gb',
$redis_bind = '127.0.0.1', $redis_bind = '127.0.0.1',