From bbaeba99448c6c87f7ad8043fa129572911b96b7 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 6 Feb 2020 18:07:20 +0000
Subject: [PATCH] openstack: remove simple-koji-ci-dev

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 inventory/cloud                               |  1 -
 .../simple-koji-ci-dev.fedorainfracloud.org   | 20 -------------------
 inventory/inventory                           |  3 ---
 playbooks/groups/simple-koji-ci.yml           |  4 ++--
 4 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 inventory/host_vars/simple-koji-ci-dev.fedorainfracloud.org

diff --git a/inventory/cloud b/inventory/cloud
index ac297e43f0..0423eec588 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -63,7 +63,6 @@ happinesspackets.fedorainfracloud.org
 happinesspackets-stg.fedorainfracloud.org
 iddev.fedorainfracloud.org
 java-deptools.fedorainfracloud.org
-simple-koji-ci-dev.fedorainfracloud.org
 simple-koji-ci-prod.fedorainfracloud.org
 lists-dev.fedorainfracloud.org
 libravatar.fedorainfracloud.org
diff --git a/inventory/host_vars/simple-koji-ci-dev.fedorainfracloud.org b/inventory/host_vars/simple-koji-ci-dev.fedorainfracloud.org
deleted file mode 100644
index c2a9346e3a..0000000000
--- a/inventory/host_vars/simple-koji-ci-dev.fedorainfracloud.org
+++ /dev/null
@@ -1,20 +0,0 @@
----
-image: "{{ fedora29_x86_64 }}"
-instance_type: m1.medium
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,all-icmp-persistent,default,all-icmp-persistent
-zone: nova
-tcp_ports: [22]
-
-inventory_tenant: persistent
-inventory_instance_name: simple-koji-ci-dev
-hostbase: simple-koji-ci-dev
-public_ip: 209.132.184.197
-root_auth_users: pingou
-description: koji simple ci development instance
-
-env: staging
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
diff --git a/inventory/inventory b/inventory/inventory
index ab896daa16..b9eafc4e48 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -735,8 +735,6 @@ virthost04.stg.phx2.fedoraproject.org
 virthost05.stg.phx2.fedoraproject.org
 wiki01.stg.phx2.fedoraproject.org
 zanata2fedmsg01.stg.phx2.fedoraproject.org
-# We know it's marked as a dev node but it simplifies things
-simple-koji-ci-dev.fedorainfracloud.org
 
 # This is a list of hosts that are a little "friendly" with staging.
 # They are exempted from the iptables wall between staging and prod.
@@ -1021,7 +1019,6 @@ respins.fedorainfracloud.org
 # upstreamfirst - ticket 6066
 upstreamfirst.fedorainfracloud.org
 # koji simple ci development - ticket 6419
-simple-koji-ci-dev.fedorainfracloud.org
 simple-koji-ci-prod.fedorainfracloud.org
 # telegram-irc bridge machine - ticket 6781
 telegram-irc.fedorainfracloud.org
diff --git a/playbooks/groups/simple-koji-ci.yml b/playbooks/groups/simple-koji-ci.yml
index 0fb8b5ecd9..e08485ae7b 100644
--- a/playbooks/groups/simple-koji-ci.yml
+++ b/playbooks/groups/simple-koji-ci.yml
@@ -1,5 +1,5 @@
 - name: check/create instance
-  hosts: simple-koji-ci-dev.fedorainfracloud.org:simple-koji-ci-prod.fedorainfracloud.org
+  hosts: simple-koji-ci-prod.fedorainfracloud.org
   gather_facts: False
 
   vars_files:
@@ -15,7 +15,7 @@
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
 - name: setup all the things
-  hosts: simple-koji-ci-dev.fedorainfracloud.org:simple-koji-ci-prod.fedorainfracloud.org
+  hosts: simple-koji-ci-prod.fedorainfracloud.org
   gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml