From 30f3039f1eab4683a937dec0cae5f5e466685e6b Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 7 Aug 2018 19:52:13 +0000
Subject: [PATCH] Remove references to long-gone odsreg.o.o service

The odsreg.openstack.org server was removed from service 2018-01-11,
and should also be cleared from our global site manifest. It was the
only thing utilizing the puppet-odsreg module, so we can take that
out of the modules list as well (that will be retired separately).

Change-Id: Iadfddb3bf57428b928cacaaa672e24c4a1e92058
---
 manifests/site.pp | 13 -------------
 modules.env       |  1 -
 2 files changed, 14 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 07a141612e..666c5ad5ec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1707,19 +1707,6 @@ node /^translate-dev\d*\.openstack\.org$/ {
 }
 
 
-# Node-OS: trusty
-node 'odsreg.openstack.org' {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80],
-    sysadmins                 => hiera('sysadmins', []),
-  }
-  realize (
-    User::Virtual::Localuser['ttx'],
-  )
-  class { '::odsreg':
-  }
-}
-
 # Node-OS: trusty
 # Node-OS: xenial
 node /^codesearch\d*\.openstack\.org$/ {
diff --git a/modules.env b/modules.env
index 1de88cdd90..4ac657a184 100644
--- a/modules.env
+++ b/modules.env
@@ -121,7 +121,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mosquitto"]="ori
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mqtt_statsd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mysql_backup"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-nodepool"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-odsreg"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openafs"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstack_health"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstackci"]="origin/master"