diff --git a/inventory/host_vars/bodhi.dev.fedoraproject.org b/inventory/host_vars/bodhi.dev.fedoraproject.org deleted file mode 100644 index afa45a0fc2..0000000000 --- a/inventory/host_vars/bodhi.dev.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -instance_type: m1.medium -image: "{{ el6_qcow_id }}" -keypair: fedora-admin-20130801 -security_group: webserver -zone: nova -hostbase: bodhi.dev -public_ip: 209.132.184.215 -root_auth_users: lmacken -description: bodhi2 dev instance -tcp_ports: ['22', '443'] diff --git a/inventory/inventory b/inventory/inventory index f390eab288..e1bdedef55 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -810,8 +810,6 @@ fed-cloud15.cloud.fedoraproject.org 209.132.184.162 #shogun-ca.cloud.fedoraproject.org (oldcloud) 209.132.184.157 -# bodhi.dev.fedoraproject.org (oldcloud) -bodhi.dev.fedoraproject.org # Koschei instance - ticket 4449 (oldcloud) koschei.cloud.fedoraproject.org # darkserver-dev (oldcloud) diff --git a/master.yml b/master.yml index e9fd9b53c9..55437ad4cc 100644 --- a/master.yml +++ b/master.yml @@ -110,7 +110,6 @@ - include: /srv/web/infra/ansible/playbooks/hosts/artboard.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/bodhi.dev.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/devpi.cloud.fedoraproject.org.yml diff --git a/playbooks/hosts/bodhi.dev.fedoraproject.org.yml b/playbooks/hosts/bodhi.dev.fedoraproject.org.yml deleted file mode 100644 index 41e8b3307a..0000000000 --- a/playbooks/hosts/bodhi.dev.fedoraproject.org.yml +++ /dev/null @@ -1,38 +0,0 @@ -- name: check/create instance - hosts: bodhi.dev.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - tasks: - - include: "{{ tasks }}/persistent_cloud.yml" - - include: "{{ tasks }}/growroot_cloud.yml" - -- name: provision instance - hosts: bodhi.dev.fedoraproject.org - user: root - gather_facts: True - vars: - - tcp_ports: [22, 443] - - udp_ports: [] - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" - - include: "{{ tasks }}/postfix_basic.yml" - - # open up tcp ports - - name: poke holes in the firewall - action: command lokkit -p '{{ item }}:tcp' - with_items: - - "{{ tcp_ports }}" - - handlers: - - include: "{{ handlers }}/restart_services.yml"