opendev/system-config
Code Issues Proposed changes

Flexible instance naming for openstackid-dev

Browse Source 
Use group variables and a node name pattern to divorce the
openstackid-dev service from the instance name of the server which
provides it. Also update the inventory matches to be consistent with
the pattern in the global site manifest.

Change-Id: I335f7ebaa5a446a83a4725bbcc0240f91cd14341
This commit is contained in:
Jeremy Stanley 2019-01-22 22:14:33 +00:00
parent b78d2f8ed6
commit 5a75bc9c96
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/groups.yaml
View File

@ -149,7 +149,7 @@ groups:
- mirror[0-9]*.open*.org
- nb[0-9]*.open*.org
- nl[0-9]*.open*.org
- openstackid-dev*.open*.org
- openstackid-dev*.openstack.org
- openstackid.org
- paste[0-9]*.open*.org
- pbx*.open*.org
@ -207,7 +207,7 @@ groups:
- health*.open*.org
- nb[0-9]*.open*.org
- nl[0-9]*.open*.org
- openstackid-dev*.open*.org
- openstackid-dev*.openstack.org
- openstackid.org
- paste[0-9]*.open*.org
- planet[0-9]*.open*.org

3
manifests/site.pp
View File

@ -1031,7 +1031,8 @@ node 'openstackid.org' {
}
# Node-OS: xenial
node 'openstackid-dev.openstack.org' {
node /^openstackid-dev\d*.openstack\.org$/ {
$group = "openstackid-dev"
class { 'openstack_project::openstackid_dev':
site_admin_password => hiera('openstackid_dev_site_admin_password'),
id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'),