diff --git a/inventory/cloud b/inventory/cloud index daf2b58346..33b3e3b1ce 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -57,7 +57,6 @@ f30-test.fedorainfracloud.org f31-test.fedorainfracloud.org aarch64-test01.fedorainfracloud.org aarch64-test02.fedorainfracloud.org -fas2-dev.fedorainfracloud.org fedora-bootstrap.fedorainfracloud.org happinesspackets.fedorainfracloud.org happinesspackets-stg.fedorainfracloud.org diff --git a/inventory/host_vars/fas2-dev.fedorainfracloud.org b/inventory/host_vars/fas2-dev.fedorainfracloud.org deleted file mode 100644 index f3be911bc3..0000000000 --- a/inventory/host_vars/fas2-dev.fedorainfracloud.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -image: "{{ centos66_x86_64 }}" -instance_type: m1.small -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,all-icmp-persistent -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: fas2-dev -hostbase: fas2-dev -public_ip: 209.132.184.63 -root_auth_users: laxathom -description: fas2 development instance - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/inventory b/inventory/inventory index c5adfb3cde..a7e5a84909 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -999,10 +999,6 @@ copr-keygen.cloud.fedoraproject.org # copr dev instances copr-be-dev.cloud.fedoraproject.org copr-fe-dev.cloud.fedoraproject.org -# fas2-dev -fas2-dev.fedorainfracloud.org -# Ansible Magazine -ansiblemagazine.fedorainfracloud.org # Fedora Bootstrap VM fedora-bootstrap.fedorainfracloud.org # lists development instance diff --git a/master.yml b/master.yml index ee95841273..1fe6cacc5d 100644 --- a/master.yml +++ b/master.yml @@ -116,12 +116,10 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/developer.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/grobisplitter01.phx2.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml deleted file mode 100644 index a55e0e20ba..0000000000 --- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +++ /dev/null @@ -1,32 +0,0 @@ -- name: check/create instance - hosts: fas2-dev.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: fas2-dev.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