opendev/system-config
Code Issues Proposed changes

Merge "Add cacti01 replacement node to Puppet"

Browse Source
This commit is contained in:
Jenkins 2016-10-12 18:02:37 +00:00 committed by Gerrit Code Review
commit fd854b90d8
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/site.pp
View File

@ -174,6 +174,17 @@ node 'cacti.openstack.org' {
} }
} }
# Node-OS: trusty
node /^cacti\d+\.openstack\.org$/ {
$group = "cacti"
include openstack_project::ssl_cert_check
class { 'openstack_project::cacti':
sysadmins => hiera('sysadmins', []),
cacti_hosts => hiera_array('cacti_hosts'),
vhost_name => 'cacti.openstack.org',
}
}
# Node-OS: trusty # Node-OS: trusty
node 'puppetmaster.openstack.org' { node 'puppetmaster.openstack.org' {
class { 'openstack_project::server': class { 'openstack_project::server':

1
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -4,6 +4,7 @@ elasticsearch ~elasticsearch0[1-7]\.openstack\.org
git-loadbalancer ~git(-fe\d+)?\.openstack\.org git-loadbalancer ~git(-fe\d+)?\.openstack\.org
git-server ~git\d+\.openstack\.org git-server ~git\d+\.openstack\.org
zuul-merger ~z[lm](static)?\d+\.openstack\.org zuul-merger ~z[lm](static)?\d+\.openstack\.org
cacti ~cacti\d+\.openstack\.org
ci-backup ci-backup-*.openstack.org ci-backup ci-backup-*.openstack.org
afsdb afsdb*.openstack.org afsdb afsdb*.openstack.org
afs afs*.*.openstack.org afs afs*.*.openstack.org