opendev/system-config
Code Issues Proposed changes

Move server class call outside of groups*.pp class

Browse Source 
site.pp handles the call to the server class for groups* nodes.

Change-Id: I061a0f3107347ace5e44d3c908b4f5a2515223eb
This commit is contained in:
Marton Kiss 2015-06-26 12:26:58 +02:00
parent e7c8e194f4
commit c08af0f4cd
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/site.pp
View File

@ -226,8 +226,11 @@ node 'graphite.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'groups.openstack.org' { node 'groups.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::groups': class { 'openstack_project::groups':
sysadmins => hiera('sysadmins', []),
site_admin_password => hiera('groups_site_admin_password', 'XXX'), site_admin_password => hiera('groups_site_admin_password', 'XXX'),
site_mysql_host => hiera('groups_site_mysql_host', 'localhost'), site_mysql_host => hiera('groups_site_mysql_host', 'localhost'),
site_mysql_password => hiera('groups_site_mysql_password', 'XXX'), site_mysql_password => hiera('groups_site_mysql_password', 'XXX'),
@ -240,8 +243,11 @@ node 'groups.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'groups-dev.openstack.org' { node 'groups-dev.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::groups_dev': class { 'openstack_project::groups_dev':
sysadmins => hiera('sysadmins', []),
site_admin_password => hiera('groups_dev_site_admin_password', 'XXX'), site_admin_password => hiera('groups_dev_site_admin_password', 'XXX'),
site_mysql_host => hiera('groups_dev_site_mysql_host', 'localhost'), site_mysql_host => hiera('groups_dev_site_mysql_host', 'localhost'),
site_mysql_password => hiera('groups_dev_site_mysql_password', 'XXX'), site_mysql_password => hiera('groups_dev_site_mysql_password', 'XXX'),

6
modules/openstack_project/manifests/groups.pp
View File

@ -20,7 +20,6 @@ class openstack_project::groups (
$site_mysql_password = '', $site_mysql_password = '',
$site_mysql_user = 'groups', $site_mysql_user = 'groups',
$conf_cron_key = '', $conf_cron_key = '',
$sysadmins = [],
$site_ssl_cert_file_contents = undef, $site_ssl_cert_file_contents = undef,
$site_ssl_key_file_contents = undef, $site_ssl_key_file_contents = undef,
$site_ssl_chain_file_contents = undef, $site_ssl_chain_file_contents = undef,
@ -33,11 +32,6 @@ class openstack_project::groups (
User::Virtual::Localuser['mkiss'], User::Virtual::Localuser['mkiss'],
) )
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins,
}
vcsrepo { '/srv/groups-static-pages': vcsrepo { '/srv/groups-static-pages':
ensure => latest, ensure => latest,
provider => git, provider => git,

6
modules/openstack_project/manifests/groups_dev.pp
View File

@ -19,7 +19,6 @@ class openstack_project::groups_dev (
$site_mysql_host = '', $site_mysql_host = '',
$site_mysql_password = '', $site_mysql_password = '',
$conf_cron_key = '', $conf_cron_key = '',
$sysadmins = [],
$site_ssl_cert_file_contents = undef, $site_ssl_cert_file_contents = undef,
$site_ssl_key_file_contents = undef, $site_ssl_key_file_contents = undef,
$site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem', $site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
@ -32,11 +31,6 @@ class openstack_project::groups_dev (
# include drupal # include drupal
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins,
}
vcsrepo { '/srv/groups-static-pages': vcsrepo { '/srv/groups-static-pages':
ensure => latest, ensure => latest,
provider => git, provider => git,