opendev
/
system-config
Code Issues Proposed changes

Merge "Just use openstack.org domain for wiki hosts"

This commit is contained in:
Zuul 2019-03-12 01:10:50 +00:00 committed by Gerrit Code Review
parent 4c784ba8d0 72e51a8998
commit b997c88e83
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inventory/groups.yaml
View File

@ -75,7 +75,7 @@ groups:
- subunit-worker[0-9]*.open*.org
- survey[0-9]*.open*.org
- translate[0-9]*.open*.org
- wiki[0-9]*.open*.org
- wiki[0-9]*.openstack.org
- ze[0-9]*.open*.org
- zk[0-9]*.open*.org
- zm[0-9]*.open*.org
@ -178,8 +178,8 @@ groups:
- survey[0-9]*.open*.org
- translate-dev[0-9]*.open*.org
- translate[0-9]*.open*.org
- wiki-dev[0-9]*.open*.org
- wiki[0-9]*.open*.org
- wiki-dev[0-9]*.openstack.org
- wiki[0-9]*.openstack.org
- ze[0-9]*.open*.org
- zm[0-9]*.open*.org
- zuul[0-9]*.open*.org
@ -191,7 +191,7 @@ groups:
- review-dev[0-9]*.open*.org
- storyboard-dev[0-9]*.opendev.org
- translate-dev[0-9]*.open*.org
- wiki-dev[0-9]*.open*.org
- wiki-dev[0-9]*.openstack.org
refstack:
- refstack*.open*.org
registry:
@ -244,12 +244,12 @@ groups:
- survey[0-9]*.open*.org
- translate-dev[0-9]*.open*.org
- translate[0-9]*.open*.org
- wiki-dev[0-9]*.open*.org
- wiki[0-9]*.open*.org
- wiki-dev[0-9]*.openstack.org
- wiki[0-9]*.openstack.org
wiki:
- wiki[0-9]*.open*.org
- wiki[0-9]*.openstack.org
wiki-dev:
- wiki-dev[0-9]*.open*.org
- wiki-dev[0-9]*.openstack.org
zookeeper:
- zk[0-9]*.open*.org
zuul-executor:

4
manifests/site.pp
View File

@ -295,7 +295,7 @@ node /^etherpad-dev\d*\.open.*\.org$/ {
}
# Node-OS: trusty
node /^wiki\d+\.open.*\.org$/ {
node /^wiki\d+\.openstack\.org$/ {
$group = "wiki"
class { 'openstack_project::wiki':
bup_user => 'bup-wiki',
@ -317,7 +317,7 @@ node /^wiki\d+\.open.*\.org$/ {
}
# Node-OS: trusty
node /^wiki-dev\d+\.open.*\.org$/ {
node /^wiki-dev\d+\.openstack\.org$/ {
$group = "wiki-dev"
class { 'openstack_project::wiki':
serveradmin => hiera('infra_apache_serveradmin'),