From 68adc48aeb34f4666f441ced5b6c45aad2bc7d9e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 7 Sep 2018 06:10:30 +0000
Subject: [PATCH] Remove modularity cloud instances

https://pagure.io/fedora-infrastructure/issue/7170
---
 inventory/cloud                               |  2 --
 .../host_vars/modularity.fedorainfracloud.org | 21 ------------
 .../modularity2.fedorainfracloud.org          | 21 ------------
 inventory/inventory                           |  3 --
 master.yml                                    |  1 -
 .../hosts/modularity.fedorainfracloud.org.yml | 32 -------------------
 6 files changed, 80 deletions(-)
 delete mode 100644 inventory/host_vars/modularity.fedorainfracloud.org
 delete mode 100644 inventory/host_vars/modularity2.fedorainfracloud.org
 delete mode 100644 playbooks/hosts/modularity.fedorainfracloud.org.yml

diff --git a/inventory/cloud b/inventory/cloud
index 24e7f51d46..77f772134b 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -58,8 +58,6 @@ simple-koji-ci-dev.fedorainfracloud.org
 simple-koji-ci-prod.fedorainfracloud.org
 lists-dev.fedorainfracloud.org
 magazine2.fedorainfracloud.org
-modularity.fedorainfracloud.org
-modularity2.fedorainfracloud.org
 ppc64le-test.fedorainfracloud.org
 ppc64-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
diff --git a/inventory/host_vars/modularity.fedorainfracloud.org b/inventory/host_vars/modularity.fedorainfracloud.org
deleted file mode 100644
index 6f8d3a3c30..0000000000
--- a/inventory/host_vars/modularity.fedorainfracloud.org
+++ /dev/null
@@ -1,21 +0,0 @@
----
-image: "Fedora-Cloud-Base-24 (Final)"
-instance_type: m1.medium
-keypair: fedora-admin-20130801
-security_group: modularity,ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,default,all-icmp-persistent
-zone: nova
-tcp_ports: [22, 80, 443]
-
-inventory_tenant: persistent
-inventory_instance_name: modularity
-hostbase: modularity
-public_ip: 209.132.184.168
-root_auth_users: langdon ralph
-description: Modularity
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-
-shared_buffers: "1GB"
-effective_cache_size: "2GB"
diff --git a/inventory/host_vars/modularity2.fedorainfracloud.org b/inventory/host_vars/modularity2.fedorainfracloud.org
deleted file mode 100644
index 65d2e1089f..0000000000
--- a/inventory/host_vars/modularity2.fedorainfracloud.org
+++ /dev/null
@@ -1,21 +0,0 @@
----
-image: "{{ fedora26_x86_64 }}"
-instance_type: m1.medium
-keypair: fedora-admin-20130801
-security_group: modularity,ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,default,all-icmp-persistent
-zone: nova
-tcp_ports: [22, 80, 443]
-
-inventory_tenant: persistent
-inventory_instance_name: modularity2
-hostbase: modularity2
-public_ip: 209.132.184.59
-root_auth_users: langdon ralph
-description: Modularity
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-
-shared_buffers: "1GB"
-effective_cache_size: "2GB"
diff --git a/inventory/inventory b/inventory/inventory
index 2b0f154dce..d34221a20c 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1216,9 +1216,6 @@ magazine2.fedorainfracloud.org
 ansiblemagazine.fedorainfracloud.org
 # Flock RegCfp instance
 regcfp2.fedorainfracloud.org
-# Modularity (ticket 5390)
-modularity.fedorainfracloud.org
-modularity2.fedorainfracloud.org
 # Fedora Bootstrap VM
 fedora-bootstrap.fedorainfracloud.org
 # lists development instance
diff --git a/master.yml b/master.yml
index 036b3056ce..27196593b5 100644
--- a/master.yml
+++ b/master.yml
@@ -148,7 +148,6 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/magazine2.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/hosts/modularity.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
diff --git a/playbooks/hosts/modularity.fedorainfracloud.org.yml b/playbooks/hosts/modularity.fedorainfracloud.org.yml
deleted file mode 100644
index d131c16171..0000000000
--- a/playbooks/hosts/modularity.fedorainfracloud.org.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- name: check/create instance
-  hosts: modularity.fedorainfracloud.org:modularity2.fedorainfracloud.org
-  gather_facts: False
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/fedora-cloud.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-
-- name: setup all the things
-  hosts: modularity.fedorainfracloud.org:modularity2.fedorainfracloud.org
-  gather_facts: True
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - name: set hostname (required by some services, at least postfix need it)
-    hostname: name="{{inventory_hostname}}"
-
-  roles:
-  - basessh