From aef7867cc0f6233a25780117b9b2f276ced4239e Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 11 Aug 2014 18:49:35 +0000 Subject: [PATCH] Update and normalize OpenStackID dev DB creds * 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 --- manifests/site.pp | 1 + modules/openstack_project/manifests/openstackid_dev.pp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index fe3fb915a1..0289585520 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -619,6 +619,7 @@ node 'openstackid-dev.openstack.org' { site_admin_password => hiera('openstackid_dev_site_admin_password', 'XXX'), id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'), 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_password => hiera('openstackid_dev_ss_mysql_password', 'XXX'), ss_mysql_user => hiera('openstackid_dev_ss_mysql_user', 'username'), diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index 7a571cc56f..6ec6dd4b08 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -18,13 +18,13 @@ class openstack_project::openstackid_dev ( $sysadmins = [], $site_admin_password = '', $id_mysql_host = '', - $id_mysql_user = 'openstackid', + $id_mysql_user = '', $id_mysql_password = '', - $id_db_name = 'openstackid_openid_dev', + $id_db_name = 'openstackid_dev', $ss_mysql_host = '', - $ss_mysql_user = 'openstackid', + $ss_mysql_user = '', $ss_mysql_password = '', - $ss_db_name = 'openstackid_silverstripe_dev', + $ss_db_name = 'os_dev', $redis_port = '6378', $redis_max_memory = '1gb', $redis_bind = '127.0.0.1',