opendev/system-config
Code Issues Proposed changes

Allow ze01.o.o access to gearman / add to cacti.o.o

Browse Source 
We also need to add gearman configuration to ze01.o.o

Change-Id: I1ed1f7b41fb85ab831d2752d1de4a2d1dad00ec0
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-06-06 15:29:37 -04:00
parent dcc75fd782
commit 0023dab613
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -493,6 +493,7 @@ cacti_hosts:
- translate.openstack.org - translate.openstack.org
- translate-dev.openstack.org - translate-dev.openstack.org
- wiki.openstack.org - wiki.openstack.org
- ze01.openstack.org
- zlstatic01.openstack.org - zlstatic01.openstack.org
- zl01.openstack.org - zl01.openstack.org
- zl02.openstack.org - zl02.openstack.org

8
manifests/site.pp
View File

@ -1107,6 +1107,7 @@ node /^ze\d+\.openstack\.org$/ {
# NOTE(pabelanger): We call ::zuul directly, so we can override all in one # NOTE(pabelanger): We call ::zuul directly, so we can override all in one
# settings. # settings.
class { '::zuul': class { '::zuul':
gearman_server => 'zuulv3.openstack.org',
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,
@ -1177,8 +1178,15 @@ node 'zuulv3.openstack.org' {
$git_name = 'OpenStack Zuul' $git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3' $revision = 'feature/zuulv3'
$gearman_workers = [
'ze01.openstack.org',
]
$iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80], iptables_public_tcp_ports => [80],
iptables_rules6 => $iptables_rules,
iptables_rules4 => $iptables_rules,
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
} }