From b8f7ea06e11f680ab834f771cc63be28b430dded Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 4 Apr 2018 00:42:22 +0000 Subject: [PATCH 1/4] Add newcloud to inventory Signed-off-by: Patrick Uiterwijk --- inventory/group_vars/newcloud | 7 +++++ .../control01.cloud.fedoraproject.org | 2 ++ inventory/inventory | 26 +++++++------------ 3 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 inventory/group_vars/newcloud create mode 100644 inventory/host_vars/control01.cloud.fedoraproject.org diff --git a/inventory/group_vars/newcloud b/inventory/group_vars/newcloud new file mode 100644 index 0000000000..5e0aa94e71 --- /dev/null +++ b/inventory/group_vars/newcloud @@ -0,0 +1,7 @@ +--- +datacenter: cloud +nm: 255.255.254.0 +gw: 209.132.184.254 +fas_client_groups: sysadmin-main +dns: 8.8.8.8 +freezes: false diff --git a/inventory/host_vars/control01.cloud.fedoraproject.org b/inventory/host_vars/control01.cloud.fedoraproject.org new file mode 100644 index 0000000000..ddde6f6d1f --- /dev/null +++ b/inventory/host_vars/control01.cloud.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth1_ip: 172.23.1.5 diff --git a/inventory/inventory b/inventory/inventory index ebe797158b..ab474afa02 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1099,23 +1099,6 @@ fed-cloud15.cloud.fedoraproject.org fed-cloud-ppc02.cloud.fedoraproject.org cloud-noc01.cloud.fedoraproject.org -[new-cloud-hardware] -fed-cloud03.cloud.fedoraproject.org -fed-cloud04.cloud.fedoraproject.org -fed-cloud05.cloud.fedoraproject.org -fed-cloud06.cloud.fedoraproject.org -fed-cloud07.cloud.fedoraproject.org -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-cloud-ppc01.cloud.fedoraproject.org -fed-cloud-ppc02.cloud.fedoraproject.org - [openstack-compute] fed-cloud03.cloud.fedoraproject.org fed-cloud04.cloud.fedoraproject.org @@ -1132,6 +1115,15 @@ fed-cloud15.cloud.fedoraproject.org #fed-cloud-ppc01.cloud.fedoraproject.org fed-cloud-ppc02.cloud.fedoraproject.org +[newcloud:children] +newcloud-control +newcloud-compute + +[newcloud-control] +control01.cloud.fedoraproject.org + +[newcloud-compute] + [pdc-web] pdc-web01.phx2.fedoraproject.org pdc-web02.phx2.fedoraproject.org From e6bff2c6d98ab53c27147bdd9f494482b25eb577 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 4 Apr 2018 00:44:33 +0000 Subject: [PATCH 2/4] Add core of newcloud.yml Signed-off-by: Patrick Uiterwijk --- playbooks/groups/newcloud.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 playbooks/groups/newcloud.yml diff --git a/playbooks/groups/newcloud.yml b/playbooks/groups/newcloud.yml new file mode 100644 index 0000000000..a60ed22aef --- /dev/null +++ b/playbooks/groups/newcloud.yml @@ -0,0 +1,29 @@ +# Set up OpenStack +# +- name: basic host setup + hosts: newcloud + 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 + + pre_tasks: + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + + roles: + - base + - rkhunter + - nagios_client + - hosts + - fas_client + - sudo + + tasks: + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + + handlers: + - import_tasks: "{{ handlers_path }}/restart_services.yml" From 94c8e45c9ca59c209a62db8c85cd10bcb2a9b493 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 4 Apr 2018 00:49:23 +0000 Subject: [PATCH 3/4] Only configure eth1 Signed-off-by: Patrick Uiterwijk --- inventory/group_vars/newcloud | 1 + 1 file changed, 1 insertion(+) diff --git a/inventory/group_vars/newcloud b/inventory/group_vars/newcloud index 5e0aa94e71..4b4821ebaa 100644 --- a/inventory/group_vars/newcloud +++ b/inventory/group_vars/newcloud @@ -5,3 +5,4 @@ gw: 209.132.184.254 fas_client_groups: sysadmin-main dns: 8.8.8.8 freezes: false +ansible_ifcfg_whitelist: ['eth1'] From 8fa2c2e77e844f970032eb8a3608a951b1be0b05 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 4 Apr 2018 00:53:16 +0000 Subject: [PATCH 4/4] Use public DNS from cloud Signed-off-by: Patrick Uiterwijk --- roles/base/files/resolv.conf/cloud | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/base/files/resolv.conf/cloud b/roles/base/files/resolv.conf/cloud index 4d417eea20..9661da5d33 100644 --- a/roles/base/files/resolv.conf/cloud +++ b/roles/base/files/resolv.conf/cloud @@ -1,4 +1,4 @@ search cloud.fedoraproject.org fedoraproject.org -nameserver 66.35.62.163 -nameserver 140.211.169.201 +nameserver 8.8.8.8 +nameserver 8.8.4.4 options rotate timeout:1