Merge "Flexible instance naming for openstackid-dev"

This commit is contained in:
Zuul 2019-01-23 21:57:00 +00:00 committed by Gerrit Code Review
commit 5d9f619b1e
2 changed files with 4 additions and 3 deletions

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

View File

@ -1032,7 +1032,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'),