Put OpenStackID servers in inventory host groups

In order to support different instance names for the OpenStackID
servers, create Ansible inventory host groups for them. Add the
group name for the production server to the Puppet global site
manifest like was already done for the dev server. Also adjust the
production server node name regex and globs to support an enumerated
naming pattern in the openstack.org domain. Finally, fix a benign
missing backslash in the openstackid-dev node name regex for
consistency.

Change-Id: Iaa30f2fa2c196ad84a8ac18b48b7390b1f4905b9

inventory/groups.yaml

@@ -115,6 +115,11 @@ groups:
     - nl[0-9]*.open*.org
   ns:
     - ns[0-9]*.open*.org
+  openstackid-dev:
+    - openstackid-dev*.openstack.org
+  openstackid:
+    - openstackid.org
+    - openstackid[0-9]*.openstack.org
   paste:
     - paste[0-9]*.open*.org
   pbx:
@@ -151,6 +156,7 @@ groups:
     - nl[0-9]*.open*.org
     - openstackid-dev*.openstack.org
     - openstackid.org
+    - openstackid[0-9]*.openstack.org
     - paste[0-9]*.open*.org
     - pbx*.open*.org
     - planet[0-9]*.open*.org
@@ -209,6 +215,7 @@ groups:
     - nl[0-9]*.open*.org
     - openstackid-dev*.openstack.org
     - openstackid.org
+    - openstackid[0-9]*.openstack.org
     - paste[0-9]*.open*.org
     - planet[0-9]*.open*.org
     - refstack*.open*.org

manifests/site.pp

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