opendev
/
system-config
Code Issues Proposed changes

Merge "Clean up after StoryBoard replacement maintenance"

This commit is contained in:
Zuul 2019-02-21 22:05:23 +00:00 committed by Gerrit Code Review
parent 0c59702709 08a553f529
commit 57d38c4412
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hiera/common.yaml
View File

@ -319,7 +319,8 @@ cacti_hosts:
- review.openstack.org
- static.openstack.org
- status01.openstack.org
- storyboard.openstack.org
- storyboard01.opendev.org
- storyboard-dev01.opendev.org
- subunit-worker01.openstack.org
- subunit-worker02.openstack.org
- translate.openstack.org

10
inventory/groups.yaml
View File

@ -68,7 +68,7 @@ groups:
- review-dev[0-9]*.open*.org
- review[0-9]*.open*.org
- storyboard-dev[0-9]*.opendev.org
- storyboard[0-9]*.open*.org
- storyboard[0-9]*.opendev.org
- static[0-9]*.open*.org
- status[0-9]*.open*.org
- subunit-worker[0-9]*.open*.org
@ -171,7 +171,8 @@ groups:
- review[0-9]*.open*.org
- static*.open*.org
- status*.open*.org
- storyboard*.open*.org
- storyboard-dev[0-9]*.opendev.org
- storyboard[0-9]*.opendev.org
- subunit-worker[0-9]*.open*.org
- survey[0-9]*.open*.org
- translate-dev[0-9]*.open*.org
@ -197,7 +198,7 @@ groups:
status:
- status*.open*.org
storyboard:
- storyboard*.open*.org
- storyboard[0-9]*.opendev.org
storyboard-dev:
- storyboard-dev[0-9]*.opendev.org
subunit-worker:
@ -231,7 +232,8 @@ groups:
- refstack*.open*.org
- static*.open*.org
- status*.open*.org
- storyboard*.open*.org
- storyboard-dev[0-9]*.opendev.org
- storyboard[0-9]*.opendev.org
- survey[0-9]*.open*.org
- translate-dev[0-9]*.open*.org
- translate[0-9]*.open*.org

7
inventory/openstack.yaml
View File

@ -807,13 +807,6 @@ all:
region_name: DFW
public_v4: 162.209.77.101
public_v6: 2001:4800:7818:103:be76:4eff:fe04:976a
storyboard.openstack.org:
ansible_host: 2001:4800:7815:103:be76:4eff:fe06:b5c
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 23.253.85.155
public_v6: 2001:4800:7815:103:be76:4eff:fe06:b5c
subunit-worker01.openstack.org:
ansible_host: 2001:4800:7822:102:be76:4eff:fe05:1751
location:

4
manifests/site.pp
View File

@ -575,9 +575,8 @@ node /^refstack\d*\.open.*\.org$/ {
}
# A machine to run Storyboard
# Node-OS: trusty
# Node-OS: xenial
node /^storyboard\d*\.open.*\.org$/ {
node /^storyboard\d+\.opendev\.org$/ {
$group = "storyboard"
class { 'openstack_project::storyboard':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
@ -606,7 +605,6 @@ node /^storyboard\d*\.open.*\.org$/ {
}
# A machine to run Storyboard devel
# Node-OS: trusty
# Node-OS: xenial
node /^storyboard-dev\d+\.opendev\.org$/ {
$group = "storyboard-dev"