diff --git a/inventory/host_vars/209.132.184.147 b/inventory/host_vars/209.132.184.147 deleted file mode 100644 index 80b5f027e2..0000000000 --- a/inventory/host_vars/209.132.184.147 +++ /dev/null @@ -1,12 +0,0 @@ ---- -instance_type: m1.small -image: "{{ el6_qcow_id }}" -keypair: fedora-admin-20130801 -security_group: webserver -zone: nova -hostbase: fedocal-dev- -public_ip: 209.132.184.147 -root_auth_users: pingou -description: fedocal dev server -volumes: ['-d /dev/vdb vol-00000010'] -freezes: false diff --git a/inventory/host_vars/209.132.184.162 b/inventory/host_vars/209.132.184.162 deleted file mode 100644 index 75cc49137d..0000000000 --- a/inventory/host_vars/209.132.184.162 +++ /dev/null @@ -1,12 +0,0 @@ ---- -instance_type: m1.small -image: "{{ el6_qcow_id }}" -keypair: fedora-admin-20130801 -security_group: webserver -zone: nova -hostbase: elections-dev- -public_ip: 209.132.184.162 -root_auth_users: toshio fchiulli -description: cloud instance for developing the next version of the elections app -volumes: ['-d /dev/vdb vol-0000000e'] -freezes: false diff --git a/inventory/inventory b/inventory/inventory index 491d54ef9b..9a8a23c683 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -808,10 +808,6 @@ fed-cloud14.cloud.fedoraproject.org fed-cloud15.cloud.fedoraproject.org [persistent-cloud] -#fedocal.dev.fedoraproject.org (oldcloud) -209.132.184.147 -#elections-dev (oldcloud) -209.132.184.162 #shogun-ca.cloud.fedoraproject.org (oldcloud) 209.132.184.157 # darkserver-dev (oldcloud) diff --git a/master.yml b/master.yml index 352a26babc..31e138d569 100644 --- a/master.yml +++ b/master.yml @@ -115,9 +115,7 @@ - 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 - include: /srv/web/infra/ansible/playbooks/hosts/dopr-dev.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/fedocal.dev.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/junk01.phx2.fedoraproject.org.yml # Waiting for rhel7 python3 and reinstall #- include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml diff --git a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml deleted file mode 100644 index 5461c7d6e1..0000000000 --- a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,56 +0,0 @@ -- name: check/create instance - hosts: 209.132.184.162 - 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: 209.132.184.162 - user: root - gather_facts: True - - 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" - - - name: mount up disk of persistent storage - action: mount name=/srv/persist src='LABEL=elections' fstype=ext4 state=mounted - - # open up ports (22, 80, 443) - - name: poke holes in the firewall - action: command lokkit {{ item }} - with_items: - - --service=ssh - - --service=https - - --service=http - - # packages needed - - name: add packages for repo - action: yum state=present name={{ item }} - with_items: - - rsync - - openssh-clients - - httpd - - httpd-tools - - cronie-noanacron - - postgresql-server - - python-psycopg2 - - python-sqlalchemy0.7 - - python-flask - - - name: startup apache - action: service name=httpd state=started - - handlers: - - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml deleted file mode 100644 index 20f179b749..0000000000 --- a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml +++ /dev/null @@ -1,69 +0,0 @@ -- name: check/create instance - hosts: 209.132.184.147 - 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: 209.132.184.147 - user: root - gather_facts: True - vars: - - tcp_ports: [22, 80, 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" - - # packages needed - - name: add packages for repo - action: yum state=present name={{ item }} - with_items: - - euca2ools - - rsync - - openssh-clients - - system-config-firewall-base - - - name: install dependencies of fedocal - action: yum state=present pkg={{ item }} - with_items: - - mod_wsgi - - mod_ssl - - python-flask - - python-flask-wtf - - mysql-server - - MySQL-python - - python-sqlalchemy - - python-kitchen - - python-fedora - - python-vobject - - pytz - - python-alembic - - python-fedora-flask - tags: - - packages - - - name: mount up disk of fedocal persistent storage - action: mount name=/srv/persist src='LABEL=fedocal.dev' fstype=ext4 state=mounted - - # 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"