opendev/system-config
Code Issues Proposed changes

Move openstack_project::server to node def

Browse Source 
Partial implementation of:
http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html

This pulls the openstack_project::server class out of the paste class
meaning only parameters actually needed by the paste class are passed
in to the paste class.

Change-Id: Iba93853c12f84271d4991679dfe80c2ca9e07d8f
Story: 2000172
This commit is contained in:
Spencer Krum 2015-03-09 17:50:01 -07:00
parent dc6618c185
commit 118b2762de
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

@ -236,10 +236,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',