opendev/system-config
Code Issues Proposed changes

Moved out the server class from the nodepool_prod class

Browse Source 
Change-Id: I976b518def0e4213c9488fc5b65cd38e02830a79
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
This commit is contained in:
George Peristerakis 2015-05-20 13:39:09 -04:00
parent a88ebb863f
commit 41af6e0e14
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -490,12 +490,16 @@ node 'status.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'nodepool.openstack.org' { node 'nodepool.openstack.org' {
class { 'openstack_project::server':
sysadmins => hiera('sysadmins', []),
iptables_public_tcp_ports => [80],
}
class { 'openstack_project::nodepool_prod': class { 'openstack_project::nodepool_prod':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
mysql_password => hiera('nodepool_mysql_password', 'XXX'), mysql_password => hiera('nodepool_mysql_password', 'XXX'),
mysql_root_password => hiera('nodepool_mysql_root_password', 'XXX'), mysql_root_password => hiera('nodepool_mysql_root_password', 'XXX'),
nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'), nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
jenkins_api_user => hiera('jenkins_api_user', 'username'), jenkins_api_user => hiera('jenkins_api_user', 'username'),
jenkins_api_key => hiera('jenkins_api_key', 'XXX'), jenkins_api_key => hiera('jenkins_api_key', 'XXX'),

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

@ -7,7 +7,6 @@ class openstack_project::nodepool_prod(
$nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb', $nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb',
$nodepool_logging_template = 'openstack_project/nodepool/nodepool.logging.conf.erb', $nodepool_logging_template = 'openstack_project/nodepool/nodepool.logging.conf.erb',
$vhost_name = 'nodepool.openstack.org', $vhost_name = 'nodepool.openstack.org',
$sysadmins = [],
$statsd_host = '', $statsd_host = '',
$jenkins_api_user ='', $jenkins_api_user ='',
$jenkins_api_key ='', $jenkins_api_key ='',
@ -26,11 +25,6 @@ class openstack_project::nodepool_prod(
$project_config_repo = '', $project_config_repo = '',
$clouds_yaml_template = 'openstack_project/nodepool/clouds.yaml.erb', $clouds_yaml_template = 'openstack_project/nodepool/clouds.yaml.erb',
) { ) {
class { 'openstack_project::server':
sysadmins => $sysadmins,
iptables_public_tcp_ports => [80],
}
class { 'project_config': class { 'project_config':
url => $project_config_repo, url => $project_config_repo,
} }