From 601d617d434a6aea2110c387d7a080da87ae33cd Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 18 Feb 2015 01:52:56 +0000 Subject: [PATCH] and we have more cloud. --- inventory/hardware | 4 +++ inventory/inventory | 8 ++--- .../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 +++++++++++++++++++ ...d.conf.cloud-noc01.cloud.fedoraproject.org | 8 +++++ 7 files changed, 160 insertions(+), 4 deletions(-) create mode 100644 playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml create mode 100644 playbooks/hosts/fed-cloud13.cloud.fedoraproject.org.yml create mode 100644 playbooks/hosts/fed-cloud14.cloud.fedoraproject.org.yml create mode 100644 playbooks/hosts/fed-cloud15.cloud.fedoraproject.org.yml diff --git a/inventory/hardware b/inventory/hardware index ad423c18c5..5c7f4fae1f 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -19,6 +19,10 @@ virthost-comm04.qa.fedoraproject.org fed-cloud09.cloud.fedoraproject.org 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 s390-02.qa.fedoraproject.org [ciscos] diff --git a/inventory/inventory b/inventory/inventory index d49d875622..4b9d9e52f8 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -692,10 +692,10 @@ fed-cloud08.cloud.fedoraproject.org fed-cloud09.cloud.fedoraproject.org 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 +fed-cloud12.cloud.fedoraproject.org +fed-cloud13.cloud.fedoraproject.org +fed-cloud14.cloud.fedoraproject.org +fed-cloud15.cloud.fedoraproject.org #fed-cloud16.cloud.fedoraproject.org cloud-noc01.cloud.fedoraproject.org diff --git a/playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml new file mode 100644 index 0000000000..e369b9a7d8 --- /dev/null +++ b/playbooks/hosts/fed-cloud12.cloud.fedoraproject.org.yml @@ -0,0 +1,36 @@ +--- + +#- 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 new file mode 100644 index 0000000000..8c9b2f046a --- /dev/null +++ b/playbooks/hosts/fed-cloud13.cloud.fedoraproject.org.yml @@ -0,0 +1,36 @@ +--- + +#- 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 new file mode 100644 index 0000000000..0c54cd5006 --- /dev/null +++ b/playbooks/hosts/fed-cloud14.cloud.fedoraproject.org.yml @@ -0,0 +1,36 @@ +--- + +#- 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 new file mode 100644 index 0000000000..74f6a5d62c --- /dev/null +++ b/playbooks/hosts/fed-cloud15.cloud.fedoraproject.org.yml @@ -0,0 +1,36 @@ +--- + +#- 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') }}" diff --git a/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org index 5389bcfb81..52c16c4141 100644 --- a/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org @@ -237,6 +237,14 @@ subnet 209.132.184.0 netmask 255.255.255.0 { filename "pxelinux.0"; } + host fed-cloud13 { + hardware ethernet ec:f4:bb:d2:76:a4; + fixed-address 209.132.184.13; + option host-name "fed-cloud13.cloud.fedoraproject.org"; + next-server 209.132.184.17; + filename "pxelinux.0"; + } + host fed-cloud14 { hardware ethernet ec:f4:bb:d2:97:7c; fixed-address 209.132.184.14;