Merge branch 'master' of /git/ansible
This commit is contained in:
commit
7d3a6fb9e5
5 changed files with 50 additions and 19 deletions
8
inventory/group_vars/newcloud
Normal file
8
inventory/group_vars/newcloud
Normal file
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
datacenter: cloud
|
||||
nm: 255.255.254.0
|
||||
gw: 209.132.184.254
|
||||
fas_client_groups: sysadmin-main
|
||||
dns: 8.8.8.8
|
||||
freezes: false
|
||||
ansible_ifcfg_whitelist: ['eth1']
|
2
inventory/host_vars/control01.cloud.fedoraproject.org
Normal file
2
inventory/host_vars/control01.cloud.fedoraproject.org
Normal file
|
@ -0,0 +1,2 @@
|
|||
---
|
||||
eth1_ip: 172.23.1.5
|
|
@ -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
|
||||
|
|
29
playbooks/groups/newcloud.yml
Normal file
29
playbooks/groups/newcloud.yml
Normal file
|
@ -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"
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue