Just use openstack.org domain for wiki hosts
Currently there are no plans to integrate the existing wiki services into OpenDev, so for clarity we're limiting the inventory globbing and global site manifest node regular expressions to the openstack.org domain specifically. Change-Id: Ifdc86f7cc5d6a865e1d5f76828ad8b52f2ee75fe
This commit is contained in:
parent
1bb1368375
commit
72e51a8998
@ -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:
|
||||
|
@ -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'),
|
||||
|
Loading…
Reference in New Issue
Block a user