From 517732d053bb4403c28bcc2359716ca584d47aa4 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 21 Jun 2016 23:21:21 +0000 Subject: [PATCH] Give storyboard-dev its own superusers list We'd like to enable additional superusers on the development instance of StoryBoard, so make it a class parameter and copy the production list to start out. Change-Id: Ie6d59e23dba59c195eb58b949c623ac4be6bfa2d --- .../files/storyboard/dev_superusers.yaml | 12 ++++++++++++ modules/openstack_project/manifests/storyboard.pp | 4 +++- .../openstack_project/manifests/storyboard/dev.pp | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 modules/openstack_project/files/storyboard/dev_superusers.yaml diff --git a/modules/openstack_project/files/storyboard/dev_superusers.yaml b/modules/openstack_project/files/storyboard/dev_superusers.yaml new file mode 100644 index 0000000000..bdef60bf2c --- /dev/null +++ b/modules/openstack_project/files/storyboard/dev_superusers.yaml @@ -0,0 +1,12 @@ +- openid: https://login.launchpad.net/+id/eMmhAdr + email: slukjanov@mirantis.com +- openid: https://login.launchpad.net/+id/cWwF3rJ + email: corvus@gnu.org +- openid: https://login.launchpad.net/+id/4dfrAmY + email: mordred@inaugust.com +- openid: https://login.launchpad.net/+id/43rCcdx + email: fungi@yuggoth.org +- openid: https://login.launchpad.net/+id/DJtBT7D + email: clark.boylan@gmail.com +- openid: https://login.launchpad.net/+id/whpdRxT + email: lyz@princessleia.com diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp index 1f3933acbd..87cd9ca9a6 100644 --- a/modules/openstack_project/manifests/storyboard.pp +++ b/modules/openstack_project/manifests/storyboard.pp @@ -7,6 +7,8 @@ class openstack_project::storyboard( $rabbitmq_user = 'storyboard', $rabbitmq_password, $sysadmins = [], + $superusers = + 'puppet:///modules/openstack_project/storyboard/superusers.yaml', $ssl_cert = undef, $ssl_cert_file_contents = undef, $ssl_key = undef, @@ -117,7 +119,7 @@ class openstack_project::storyboard( # Load the superusers into the database class { '::storyboard::load_superusers': - source => 'puppet:///modules/openstack_project/storyboard/superusers.yaml', + source => $superusers, } include bup diff --git a/modules/openstack_project/manifests/storyboard/dev.pp b/modules/openstack_project/manifests/storyboard/dev.pp index d82ce6fba8..222f50c7af 100644 --- a/modules/openstack_project/manifests/storyboard/dev.pp +++ b/modules/openstack_project/manifests/storyboard/dev.pp @@ -21,6 +21,8 @@ class openstack_project::storyboard::dev( class { 'openstack_project::storyboard': project_config_repo => $project_config_repo, sysadmins => $sysadmins, + superusers => + 'puppet:///modules/openstack_project/storyboard/dev_superusers.yaml', mysql_host => $mysql_host, mysql_user => $mysql_user, mysql_password => $mysql_password,