From 81e7d8fa98df27608ececef3994497b72b7610eb Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 18 Feb 2015 12:47:17 +0000 Subject: [PATCH] Move new openstack compute nodes to a group playbook. --- inventory/inventory | 8 +++++ .../openstack-compute-nodes.yml} | 4 +-- .../fed-cloud11.cloud.fedoraproject.org.yml | 36 ------------------- .../fed-cloud12.cloud.fedoraproject.org.yml | 36 ------------------- .../fed-cloud13.cloud.fedoraproject.org.yml | 36 ------------------- .../fed-cloud14.cloud.fedoraproject.org.yml | 36 ------------------- .../fed-cloud15.cloud.fedoraproject.org.yml | 36 ------------------- 7 files changed, 10 insertions(+), 182 deletions(-) rename playbooks/{hosts/fed-cloud10.cloud.fedoraproject.org.yml => groups/openstack-compute-nodes.yml} (88%) delete mode 100644 playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml delete mode 100644 playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml delete mode 100644 playbooks/hosts/fed-cloud13.cloud.fedoraproject.org.yml delete mode 100644 playbooks/hosts/fed-cloud14.cloud.fedoraproject.org.yml delete mode 100644 playbooks/hosts/fed-cloud15.cloud.fedoraproject.org.yml diff --git a/inventory/inventory b/inventory/inventory index 4b9d9e52f8..c96a41bba4 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -699,6 +699,14 @@ fed-cloud15.cloud.fedoraproject.org #fed-cloud16.cloud.fedoraproject.org cloud-noc01.cloud.fedoraproject.org +[openstack-compute] +fed-cloud10.cloud.fedoraproject.org +fed-cloud11.cloud.fedoraproject.org +fed-cloud12.cloud.fedoraproject.org +fed-cloud13.cloud.fedoraproject.org +fed-cloud14.cloud.fedoraproject.org +fed-cloud15.cloud.fedoraproject.org + [persistent-cloud] #fedocal.dev.fedoraproject.org 209.132.184.147 diff --git a/playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml b/playbooks/groups/openstack-compute-nodes.yml similarity index 88% rename from playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml rename to playbooks/groups/openstack-compute-nodes.yml index 76e60f2b9e..9cc4b44d32 100644 --- a/playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -1,7 +1,7 @@ --- -- name: deploy Open Stack compute node - hosts: fed-cloud10.cloud.fedoraproject.org +- name: deploy Open Stack compute nodes + hosts: openstack-compute user: root sudo: yes gather_facts: True diff --git a/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml deleted file mode 100644 index 14ce24381a..0000000000 --- a/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -#- name: deploy Open Stack compute node -- name: deploy Kushal temp box - hosts: fed-cloud11.cloud.fedoraproject.org - user: root - sudo: yes - 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 -# - /srv/web/infra/ansible/vars/fedora-cloud.yml -# - "{{ private }}/files/openstack/passwords.yml" - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - sudo -# - cloud_compute - - tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" - -# - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" diff --git a/playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml deleted file mode 100644 index e369b9a7d8..0000000000 --- a/playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -#- name: deploy Open Stack compute node -- name: deploy Kushal temp box - hosts: fed-cloud12.cloud.fedoraproject.org - user: root - sudo: yes - 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 -# - /srv/web/infra/ansible/vars/fedora-cloud.yml -# - "{{ private }}/files/openstack/passwords.yml" - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - sudo -# - cloud_compute - - tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" - -# - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" diff --git a/playbooks/hosts/fed-cloud13.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud13.cloud.fedoraproject.org.yml deleted file mode 100644 index 8c9b2f046a..0000000000 --- a/playbooks/hosts/fed-cloud13.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -#- name: deploy Open Stack compute node -- name: deploy Kushal temp box - hosts: fed-cloud13.cloud.fedoraproject.org - user: root - sudo: yes - 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 -# - /srv/web/infra/ansible/vars/fedora-cloud.yml -# - "{{ private }}/files/openstack/passwords.yml" - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - sudo -# - cloud_compute - - tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" - -# - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" diff --git a/playbooks/hosts/fed-cloud14.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud14.cloud.fedoraproject.org.yml deleted file mode 100644 index 0c54cd5006..0000000000 --- a/playbooks/hosts/fed-cloud14.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -#- name: deploy Open Stack compute node -- name: deploy Kushal temp box - hosts: fed-cloud14.cloud.fedoraproject.org - user: root - sudo: yes - 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 -# - /srv/web/infra/ansible/vars/fedora-cloud.yml -# - "{{ private }}/files/openstack/passwords.yml" - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - sudo -# - cloud_compute - - tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" - -# - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" diff --git a/playbooks/hosts/fed-cloud15.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud15.cloud.fedoraproject.org.yml deleted file mode 100644 index 74f6a5d62c..0000000000 --- a/playbooks/hosts/fed-cloud15.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -#- name: deploy Open Stack compute node -- name: deploy Kushal temp box - hosts: fed-cloud15.cloud.fedoraproject.org - user: root - sudo: yes - 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 -# - /srv/web/infra/ansible/vars/fedora-cloud.yml -# - "{{ private }}/files/openstack/passwords.yml" - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - sudo -# - cloud_compute - - tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" - -# - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}"