From 2a10011a91b47b3210510806c9cbc426d436db7f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 5 Mar 2018 17:50:58 +0000 Subject: [PATCH] Drop some obsolete cloud instances --- .../host_vars/grafana.cloud.fedoraproject.org | 24 ---------- .../host_vars/graphite.fedorainfracloud.org | 24 ---------- .../modernpaste.fedorainfracloud.org | 18 -------- inventory/inventory | 5 -- .../hosts/grafana.cloud.fedoraproject.org.yml | 46 ------------------- .../hosts/graphite.fedorainfracloud.org.yml | 46 ------------------- .../modernpaste.fedorainfracloud.org.yml | 42 ----------------- 7 files changed, 205 deletions(-) delete mode 100644 inventory/host_vars/grafana.cloud.fedoraproject.org delete mode 100644 inventory/host_vars/graphite.fedorainfracloud.org delete mode 100644 inventory/host_vars/modernpaste.fedorainfracloud.org delete mode 100644 playbooks/hosts/grafana.cloud.fedoraproject.org.yml delete mode 100644 playbooks/hosts/graphite.fedorainfracloud.org.yml delete mode 100644 playbooks/hosts/modernpaste.fedorainfracloud.org.yml diff --git a/inventory/host_vars/grafana.cloud.fedoraproject.org b/inventory/host_vars/grafana.cloud.fedoraproject.org deleted file mode 100644 index c762999030..0000000000 --- a/inventory/host_vars/grafana.cloud.fedoraproject.org +++ /dev/null @@ -1,24 +0,0 @@ -ansible_ifcfg_blacklist: true -instance_type: m1.medium -image: "{{ fedora23_x86_64 }}" -keypair: fedora-admin-20130801 -security_group: default,wide-open-persistent -zone: nova -tcp_ports: [22, 80, 443] -custom_rules: - - "-A INPUT -p tcp -m tcp --dport 2003 -s 209.132.176.0/20 -j ACCEPT" - -inventory_tenant: persistent -inventory_instance_name: grafana -hostbase: grafana -public_ip: 209.132.184.44 -root_auth_users: codeblock ralph -description: graphite/statsd/grafana/etc experimentation - -volumes: - - volume_id: 818172fb-c278-4569-978f-f2822ab2d021 - device: /dev/vdc - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/host_vars/graphite.fedorainfracloud.org b/inventory/host_vars/graphite.fedorainfracloud.org deleted file mode 100644 index 68d349a3a9..0000000000 --- a/inventory/host_vars/graphite.fedorainfracloud.org +++ /dev/null @@ -1,24 +0,0 @@ -ansible_ifcfg_blacklist: true -instance_type: m1.large -image: "{{ fedora23_x86_64 }}" -keypair: fedora-admin-20130801 -security_group: default,wide-open-persistent,all-icmp-persistent -zone: nova -tcp_ports: [22, 80, 443] -custom_rules: - - "-A INPUT -p tcp -m tcp --dport 2003 -s 209.132.176.0/20 -j ACCEPT" - -inventory_tenant: persistent -inventory_instance_name: graphite -hostbase: graphite -public_ip: 209.132.184.151 -root_auth_users: codeblock ralph -description: graphite/statsd experimentation (backend) - -volumes: - - volume_id: 818172fb-c278-4569-978f-f2822ab2d021 - device: /dev/vdc - -# persistent-net -cloud_networks: - - net-id: 67b77354-39a4-43de-b007-bb813ac5c35f diff --git a/inventory/host_vars/modernpaste.fedorainfracloud.org b/inventory/host_vars/modernpaste.fedorainfracloud.org deleted file mode 100644 index bcddcaf05b..0000000000 --- a/inventory/host_vars/modernpaste.fedorainfracloud.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -image: "{{ fedora23_x86_64 }}" -instance_type: m1.small -keypair: fedora-admin-20130801 -security_group: 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: modernpaste -hostbase: modernpaste -public_ip: 209.132.184.103 -root_auth_users: codeblock ryanlerch -description: modernpaste testing - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/inventory b/inventory/inventory index e73021e1c8..d38c24cc40 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1160,9 +1160,6 @@ copr-fe-dev.cloud.fedoraproject.org # taiga for kanban-style project planning taiga.fedorainfracloud.org taigastg.fedorainfracloud.org -# graphite/statsd/grafana exploration -grafana.cloud.fedoraproject.org -graphite.fedorainfracloud.org # glittergallery GSoC dev work glittergallery-dev.fedorainfracloud.org # shumgrepper-dev @@ -1197,8 +1194,6 @@ java-deptools.fedorainfracloud.org developer.fedorainfracloud.org # fedimg-dev development instance fedimg-dev.fedorainfracloud.org -# modernpaste testing -modernpaste.fedorainfracloud.org # eclipse help center - ticket 5293 eclipse.fedorainfracloud.org # iddev diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml deleted file mode 100644 index a20feab6f0..0000000000 --- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,46 +0,0 @@ -- name: check/create instance - hosts: grafana.cloud.fedoraproject.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: grafana.cloud.fedoraproject.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 - - roles: - - base - - rkhunter - - mod_wsgi - #- graphite/graphite - #- graphite/statsd - #- graphite/fedmsg2statsd - - graphite/grafana - - tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - #- import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.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}}" diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml deleted file mode 100644 index 0889210d1b..0000000000 --- a/playbooks/hosts/graphite.fedorainfracloud.org.yml +++ /dev/null @@ -1,46 +0,0 @@ -- name: check/create instance - hosts: graphite.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: graphite.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 - - roles: - - base - - rkhunter - - mod_wsgi - - certbot - - graphite/graphite - - graphite/statsd - - graphite/fedmsg2statsd - - tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - #- import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.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}}" diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml deleted file mode 100644 index 9f612af53e..0000000000 --- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml +++ /dev/null @@ -1,42 +0,0 @@ -- name: check/create instance - hosts: modernpaste.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: modernpaste.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 - - roles: - - basessh - - sudo - - hosts - - mod_wsgi - - base - - pre_tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - 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}}" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml"