From 2dfb98136a0097387750c9a8de0136458be8ff47 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: May 20 2019 18:10:46 +0000 Subject: ansible: more cleanup from group name changes. Signed-off-by: Kevin Fenzi --- diff --git a/inventory/cloud b/inventory/cloud index 36a8919..87258c2 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -53,7 +53,6 @@ copr-keygen.cloud.fedoraproject.org copr-keygen-dev.cloud.fedoraproject.org copr-keygen-stg.fedorainfracloud.org developer.fedorainfracloud.org -elastic-dev.fedorainfracloud.org el6-test.fedorainfracloud.org el7-test.fedorainfracloud.org f28-test.fedorainfracloud.org diff --git a/inventory/inventory b/inventory/inventory index ee87656..f6ac1a4 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1136,8 +1136,6 @@ commops.fedorainfracloud.org respins.fedorainfracloud.org # upstreamfirst - ticket 6066 upstreamfirst.fedorainfracloud.org -# elastic devel instance - ticket 6479 -elastic-dev.fedorainfracloud.org # koji simple ci development - ticket 6419 simple-koji-ci-dev.fedorainfracloud.org simple-koji-ci-prod.fedorainfracloud.org diff --git a/master.yml b/master.yml index a85b30b..792b82f 100644 --- a/master.yml +++ b/master.yml @@ -133,7 +133,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/commops.fedorainfracloud.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/elastic-dev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml #- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 14d5755..f4b5d9e 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -34,7 +34,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure bastion-qa - hosts: bastion_comm01.qa.fedoraproject.org + hosts: bastion-comm01.qa.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 3e6af80..1a07f30 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -167,7 +167,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure varnish cache - hosts: buildvm_s390x_07.s390.fedoraproject.org:buildvm_s390x_01.stg.s390.fedoraproject.org + hosts: buildvm-s390x-07.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org tags: - varnish user: root @@ -185,7 +185,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure sshfs on buildvm-s390x-01 - hosts: buildvm_s390x_01.s390.fedoraproject.org:buildvm_s390x_01.stg.s390.fedoraproject.org + hosts: buildvm-s390x-01.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org tags: - sshfs user: root diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index c61f964..b4870c2 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -1,5 +1,5 @@ # create an os server -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-control-stg:os-control:os-nodes-stg:os-masters-stg:os-nodes:os-masters" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os_control_stg:os_control:os_nodes_stg:os_masters_stg:os_nodes:os_masters" - name: make the box be real hosts: os_control:os_control_stg:os_masters_stg:os_nodes_stg:os_masters:os_nodes diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index e57c015..a9f2abb 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -7,7 +7,7 @@ # Once the instance exists, configure it. - name: configure postgresql server system - hosts: db_datanommer02.phx2.fedoraproject.org:db_qa01.qa.fedoraproject.org:db_koji01.phx2.fedoraproject.org:db_fas01.stg.phx2.fedoraproject.org:db_fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db_qa02.qa.fedoraproject.org:db_koji01.stg.phx2.fedoraproject.org:db_qa03.qa.fedoraproject.org + hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.phx2.fedoraproject.org:db-qa03.qa.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index a177834..3f4e82c 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -1,6 +1,6 @@ # create a new proxy server -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg:!proxy05.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies_stg:!proxy05.fedoraproject.org" - name: make the box be real hosts: proxies_stg:proxies diff --git a/playbooks/groups/simple-koji-ci.yml b/playbooks/groups/simple-koji-ci.yml index c5857f1..0fb8b5e 100644 --- a/playbooks/groups/simple-koji-ci.yml +++ b/playbooks/groups/simple-koji-ci.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: simple_koji_ci_dev.fedorainfracloud.org:simple_koji_ci_prod.fedorainfracloud.org + hosts: simple-koji-ci-dev.fedorainfracloud.org:simple-koji-ci-prod.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: simple_koji_ci_dev.fedorainfracloud.org:simple_koji_ci_prod.fedorainfracloud.org + hosts: simple-koji-ci-dev.fedorainfracloud.org:simple-koji-ci-prod.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 8493426..ccf566b 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -1,7 +1,7 @@ # This is a basic playbook - name: make cloud noc hardware - hosts: cloud_noc01.cloud.fedoraproject.org + hosts: cloud-noc01.cloud.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 15ca1d6..62e8e32 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -1,7 +1,7 @@ # This is a basic playbook - name: dole out the generic configuration - hosts: data_analysis01.phx2.fedoraproject.org + hosts: data-analysis01.phx2.fedoraproject.org user: root gather_facts: True @@ -38,7 +38,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: data_analysis01.phx2.fedoraproject.org + hosts: data-analysis01.phx2.fedoraproject.org user: root gather_facts: True vars_files: diff --git a/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml b/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml deleted file mode 100644 index 07f64f4..0000000 --- a/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml +++ /dev/null @@ -1,35 +0,0 @@ -- name: check/create instance - hosts: elastic_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" - - import_tasks: "{{ roles_path }}/basessh/handlers/main.yml" - - -- name: setup all the things - hosts: elastic_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}}" - - - import_tasks: "{{ tasks_path }}/yumrepos.yml" diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml index e6e2ae4..a55e0e2 100644 --- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: fas2_dev.fedorainfracloud.org + hosts: fas2-dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: fas2_dev.fedorainfracloud.org + hosts: fas2-dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index ee18eb1..ce898b4 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -18,7 +18,7 @@ authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" - name: deploy Open Stack controler - hosts: fed_cloud09.cloud.fedoraproject.org + hosts: fed-cloud09.cloud.fedoraproject.org gather_facts: True vars: diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml index 469119b..9a8cb91 100644 --- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: fedimg_dev.fedorainfracloud.org + hosts: fedimg-dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: fedimg_dev.fedorainfracloud.org + hosts: fedimg-dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index 837909b..840e7c6 100644 --- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: fedora_bootstrap.fedorainfracloud.org + hosts: fedora-bootstrap.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: fedora_bootstrap.fedorainfracloud.org + hosts: fedora-bootstrap.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml index bed2c16..dc7e492 100644 --- a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: glittergallery_dev.fedorainfracloud.org + hosts: glittergallery-dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: glittergallery_dev.fedorainfracloud.org + hosts: glittergallery-dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml deleted file mode 100644 index e2c2d06..0000000 --- a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml +++ /dev/null @@ -1,67 +0,0 @@ -- name: check/create instance - hosts: hubs_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: hubs_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}}" - - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - - roles: - - basessh - - - role: hubs - main_user: hubs - hubs_url_hostname: "{{ ansible_fqdn }}" - hubs_secret_key: demotestinghubsmachine - hubs_db_type: postgresql - hubs_dev_mode: false - hubs_conf_dir: /etc/fedora-hubs - hubs_var_dir: /var/lib/fedora-hubs - hubs_ssl_cert: /etc/letsencrypt/live/{{ ansible_fqdn }}/fullchain.pem - hubs_ssl_key: /etc/letsencrypt/live/{{ ansible_fqdn }}/privkey.pem - hubs_fas_username: "{{ fedoraDummyUser }}" - hubs_fas_password: "{{ fedoraDummyUserPassword }}" - - - tasks: - - dnf: name={{item}} state=present - with_items: - - htop - - tmux - - vim - - - name: add more hubs workers - service: name={{item}} enabled=yes state=started - with_items: - - fedora-hubs-triage@3 - - fedora-hubs-triage@4 - - fedora-hubs-worker@3 - - fedora-hubs-worker@4 diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index cbeb8bf..d016903 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: lists_dev.fedorainfracloud.org + hosts: lists-dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: lists_dev.fedorainfracloud.org + hosts: lists-dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml