From 72e51a899834e52ddeb2d217d9da3a539a989ed9 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 10 Mar 2019 14:32:11 +0000
Subject: [PATCH] Just use openstack.org domain for wiki hosts

Currently there are no plans to integrate the existing wiki services
into OpenDev, so for clarity we're limiting the inventory globbing
and global site manifest node regular expressions to the
openstack.org domain specifically.

Change-Id: Ifdc86f7cc5d6a865e1d5f76828ad8b52f2ee75fe
---
 inventory/groups.yaml | 16 ++++++++--------
 manifests/site.pp     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 43ec71f5eb..dfb5e0d296 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -75,7 +75,7 @@ groups:
     - subunit-worker[0-9]*.open*.org
     - survey[0-9]*.open*.org
     - translate[0-9]*.open*.org
-    - wiki[0-9]*.open*.org
+    - wiki[0-9]*.openstack.org
     - ze[0-9]*.open*.org
     - zk[0-9]*.open*.org
     - zm[0-9]*.open*.org
@@ -178,8 +178,8 @@ groups:
     - survey[0-9]*.open*.org
     - translate-dev[0-9]*.open*.org
     - translate[0-9]*.open*.org
-    - wiki-dev[0-9]*.open*.org
-    - wiki[0-9]*.open*.org
+    - wiki-dev[0-9]*.openstack.org
+    - wiki[0-9]*.openstack.org
     - ze[0-9]*.open*.org
     - zm[0-9]*.open*.org
     - zuul[0-9]*.open*.org
@@ -191,7 +191,7 @@ groups:
     - review-dev[0-9]*.open*.org
     - storyboard-dev[0-9]*.opendev.org
     - translate-dev[0-9]*.open*.org
-    - wiki-dev[0-9]*.open*.org
+    - wiki-dev[0-9]*.openstack.org
   refstack:
     - refstack*.open*.org
   registry:
@@ -244,12 +244,12 @@ groups:
     - survey[0-9]*.open*.org
     - translate-dev[0-9]*.open*.org
     - translate[0-9]*.open*.org
-    - wiki-dev[0-9]*.open*.org
-    - wiki[0-9]*.open*.org
+    - wiki-dev[0-9]*.openstack.org
+    - wiki[0-9]*.openstack.org
   wiki:
-    - wiki[0-9]*.open*.org
+    - wiki[0-9]*.openstack.org
   wiki-dev:
-    - wiki-dev[0-9]*.open*.org
+    - wiki-dev[0-9]*.openstack.org
   zookeeper:
     - zk[0-9]*.open*.org
   zuul-executor:
diff --git a/manifests/site.pp b/manifests/site.pp
index 952c2f5500..28a35f76c0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -295,7 +295,7 @@ node /^etherpad-dev\d*\.open.*\.org$/ {
 }
 
 # Node-OS: trusty
-node /^wiki\d+\.open.*\.org$/ {
+node /^wiki\d+\.openstack\.org$/ {
   $group = "wiki"
   class { 'openstack_project::wiki':
     bup_user                  => 'bup-wiki',
@@ -317,7 +317,7 @@ node /^wiki\d+\.open.*\.org$/ {
 }
 
 # Node-OS: trusty
-node /^wiki-dev\d+\.open.*\.org$/ {
+node /^wiki-dev\d+\.openstack\.org$/ {
   $group = "wiki-dev"
   class { 'openstack_project::wiki':
     serveradmin           => hiera('infra_apache_serveradmin'),