opendev/system-config
Code Issues Proposed changes

Merge "Put OpenStackID servers in inventory host groups"

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

7
inventory/groups.yaml
View File

@ -114,6 +114,11 @@ groups:
- nl[0-9]*.open*.org - nl[0-9]*.open*.org
ns: ns:
- ns[0-9]*.open*.org - ns[0-9]*.open*.org
openstackid-dev:
- openstackid-dev*.openstack.org
openstackid:
- openstackid.org
- openstackid[0-9]*.openstack.org
paste: paste:
- paste[0-9]*.open*.org - paste[0-9]*.open*.org
pbx: pbx:
@ -150,6 +155,7 @@ groups:
- nl[0-9]*.open*.org - nl[0-9]*.open*.org
- openstackid-dev*.openstack.org - openstackid-dev*.openstack.org
- openstackid.org - openstackid.org
- openstackid[0-9]*.openstack.org
- paste[0-9]*.open*.org - paste[0-9]*.open*.org
- pbx*.open*.org - pbx*.open*.org
- planet[0-9]*.open*.org - planet[0-9]*.open*.org
@ -210,6 +216,7 @@ groups:
- nl[0-9]*.open*.org - nl[0-9]*.open*.org
- openstackid-dev*.openstack.org - openstackid-dev*.openstack.org
- openstackid.org - openstackid.org
- openstackid[0-9]*.openstack.org
- paste[0-9]*.open*.org - paste[0-9]*.open*.org
- planet[0-9]*.open*.org - planet[0-9]*.open*.org
- refstack*.open*.org - refstack*.open*.org

5
manifests/site.pp
View File

@ -1062,7 +1062,8 @@ node /^backup\d+\..*\.ci\.open.*\.org$/ {
} }
# Node-OS: trusty # Node-OS: trusty
node 'openstackid.org' { node /^openstackid\d*(\.openstack)?\.org$/ {
$group = "openstackid"
class { 'openstack_project::openstackid_prod': class { 'openstack_project::openstackid_prod':
site_admin_password => hiera('openstackid_site_admin_password'), site_admin_password => hiera('openstackid_site_admin_password'),
id_mysql_host => hiera('openstackid_id_mysql_host', 'localhost'), id_mysql_host => hiera('openstackid_id_mysql_host', 'localhost'),
@ -1091,7 +1092,7 @@ node 'openstackid.org' {
} }
# Node-OS: xenial # Node-OS: xenial
node /^openstackid-dev\d*.openstack\.org$/ { node /^openstackid-dev\d*\.openstack\.org$/ {
$group = "openstackid-dev" $group = "openstackid-dev"
class { 'openstack_project::openstackid_dev': class { 'openstack_project::openstackid_dev':
site_admin_password => hiera('openstackid_dev_site_admin_password'), site_admin_password => hiera('openstackid_dev_site_admin_password'),