opendev/system-config
Code Issues Proposed changes

Merge "Move openstack_project::server to node def"

Browse Source
This commit is contained in:
Jenkins 2015-03-13 16:08:47 +00:00 committed by Gerrit Code Review
commit 58f1c1e8ae
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/site.pp
View File

@ -237,10 +237,13 @@ node 'lists.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'paste.openstack.org' { node 'paste.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::paste': class { 'openstack_project::paste':
db_password => hiera('paste_db_password', 'XXX'), db_password => hiera('paste_db_password', 'XXX'),
mysql_root_password => hiera('paste_mysql_root_password', 'XXX'), mysql_root_password => hiera('paste_mysql_root_password', 'XXX'),
sysadmins => hiera('sysadmins', []),
} }
} }

5
modules/openstack_project/manifests/paste.pp
View File

@ -3,12 +3,7 @@
class openstack_project::paste ( class openstack_project::paste (
$db_password, $db_password,
$mysql_root_password, $mysql_root_password,
$sysadmins = []
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => $sysadmins,
}
include lodgeit include lodgeit
lodgeit::site { 'openstack': lodgeit::site { 'openstack':
db_host => 'localhost', db_host => 'localhost',