opendev/system-config
Code Issues Proposed changes

Merge "Remove old storyboard-dev from inventory"

Browse Source
This commit is contained in:
Zuul 2019-02-04 20:37:34 +00:00 committed by Gerrit Code Review
commit 2a9136366a
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/groups.yaml
View File

@ -65,7 +65,7 @@ groups:
- planet[0-9]*.open*.org - planet[0-9]*.open*.org
- review-dev[0-9]*.open*.org - review-dev[0-9]*.open*.org
- review[0-9]*.open*.org - review[0-9]*.open*.org
- storyboard-dev[0-9]*.open*.org - storyboard-dev[0-9]*.opendev.org
- storyboard[0-9]*.open*.org - storyboard[0-9]*.open*.org
- static[0-9]*.open*.org - static[0-9]*.open*.org
- status[0-9]*.open*.org - status[0-9]*.open*.org
@ -190,7 +190,7 @@ groups:
storyboard: storyboard:
- storyboard*.open*.org - storyboard*.open*.org
storyboard-dev: storyboard-dev:
- storyboard-dev*.open*.org - storyboard-dev[0-9]*.opendev.org
subunit-worker: subunit-worker:
- subunit-worker[0-9]*.open*.org - subunit-worker[0-9]*.open*.org
survey: survey:

8
inventory/openstack.yaml
View File

@ -864,14 +864,6 @@ all:
private_v4: 10.208.163.115 private_v4: 10.208.163.115
public_v4: 23.253.234.105 public_v4: 23.253.234.105
public_v6: 2001:4800:7817:103:be76:4eff:fe04:93f6 public_v6: 2001:4800:7817:103:be76:4eff:fe04:93f6
storyboard-dev.openstack.org:
ansible_host: 2001:4800:7815:102:be76:4eff:fe05:3f4c
location:
cloud: openstackci-rax
region_name: DFW
private_v4: 10.208.0.49
public_v4: 23.253.90.40
public_v6: 2001:4800:7815:102:be76:4eff:fe05:3f4c
storyboard.openstack.org: storyboard.openstack.org:
ansible_host: 2001:4800:7815:103:be76:4eff:fe06:b5c ansible_host: 2001:4800:7815:103:be76:4eff:fe06:b5c
location: location:

2
manifests/site.pp
View File

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