opendev/system-config
Code Issues Proposed changes

Merge "Update storyboard version to include rabbitmq"

Browse Source
This commit is contained in:
Jenkins 2014-08-13 22:21:45 +00:00 committed by Gerrit Code Review
commit 86aeb6803b
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install_modules.sh
View File

@ -55,9 +55,10 @@ MODULES["puppetlabs-firewall"]="0.0.4"
MODULES["puppetlabs-puppetdb"]="3.0.1"
MODULES["stankevich-python"]="1.6.6"
MODULES["example42-puppi"]="2.1.9"
MODULES["puppetlabs-rabbitmq"]="4.0.0"
SOURCE_MODULES["https://github.com/nibalizer/puppet-module-puppetboard"]="2.4.0"
SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="e4857b1a70d697cca2e8eedeb626a4422c705bdf"
SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="fb38fa63b3e7d9969d9130a46add4c24580cfc47"
MODULE_LIST=`puppet module list`

2
manifests/site.pp
View File

@ -400,6 +400,8 @@ node 'storyboard.openstack.org' {
mysql_host => hiera('storyboard_db_host', 'localhost'),
mysql_user => hiera('storyboard_db_user', 'username'),
mysql_password => hiera('storyboard_db_password', 'XXX'),
rabbitmq_user => hiera('storyboard_rabbit_user', 'username'),
rabbitmq_password => hiera('storyboard_rabbit_password', 'XXX'),
ssl_cert_file_contents => hiera('storyboard_ssl_cert_file_contents', 'XXX'),
ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents', 'XXX'),
ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents', 'XXX')

24
modules/openstack_project/manifests/storyboard.pp
View File

@ -4,6 +4,8 @@ class openstack_project::storyboard(
$mysql_host = '',
$mysql_password = '',
$mysql_user = '',
$rabbitmq_user = 'storyboard',
$rabbitmq_password,
$sysadmins = [],
$ssl_cert_file_contents = undef,
$ssl_key_file_contents = undef,
@ -24,12 +26,22 @@ class openstack_project::storyboard(
}
class { '::storyboard::application':
hostname => $::fqdn,
openid_url => $openid_url,
mysql_host => $mysql_host,
mysql_database => 'storyboard',
mysql_user => $mysql_user,
mysql_user_password => $mysql_password
hostname => $::fqdn,
openid_url => $openid_url,
mysql_host => $mysql_host,
mysql_database => 'storyboard',
mysql_user => $mysql_user,
mysql_user_password => $mysql_password,
rabbitmq_host => 'localhost',
rabbitmq_port => 5672,
rabbitmq_vhost => '/',
rabbitmq_user => $rabbitmq_user,
rabbitmq_user_password => $rabbitmq_password
}
class { '::storyboard::rabbit':
rabbitmq_user => $rabbitmq_user,
rabbitmq_user_password => $rabbitmq_password
}
# Load the projects into the database.