Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

ansible: more cleanup from group name changes.

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-05-20 18:10:46 +00:00
parent 71e1e51b93
commit 2dfb98136a
19 changed files with 22 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/cloud
View file

@ -53,7 +53,6 @@ copr-keygen.cloud.fedoraproject.org
copr-keygen-dev.cloud.fedoraproject.org copr-keygen-dev.cloud.fedoraproject.org
copr-keygen-stg.fedorainfracloud.org copr-keygen-stg.fedorainfracloud.org
developer.fedorainfracloud.org developer.fedorainfracloud.org
elastic-dev.fedorainfracloud.org
el6-test.fedorainfracloud.org el6-test.fedorainfracloud.org
el7-test.fedorainfracloud.org el7-test.fedorainfracloud.org
f28-test.fedorainfracloud.org f28-test.fedorainfracloud.org

2
inventory/inventory
View file

@ -1136,8 +1136,6 @@ commops.fedorainfracloud.org
respins.fedorainfracloud.org respins.fedorainfracloud.org
# upstreamfirst - ticket 6066 # upstreamfirst - ticket 6066
upstreamfirst.fedorainfracloud.org upstreamfirst.fedorainfracloud.org
# elastic devel instance - ticket 6479
elastic-dev.fedorainfracloud.org
# koji simple ci development - ticket 6419 # koji simple ci development - ticket 6419
simple-koji-ci-dev.fedorainfracloud.org simple-koji-ci-dev.fedorainfracloud.org
simple-koji-ci-prod.fedorainfracloud.org simple-koji-ci-prod.fedorainfracloud.org

1
master.yml
View file

@ -133,7 +133,6 @@
- import_playbook: /srv/web/infra/ansible/playbooks/hosts/commops.fedorainfracloud.org.yml - 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/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/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/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/fed-cloud09.cloud.fedoraproject.org.yml
- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml

2
playbooks/groups/bastion.yml
View file

@ -34,7 +34,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure bastion-qa - name: configure bastion-qa
hosts: bastion_comm01.qa.fedoraproject.org hosts: bastion-comm01.qa.fedoraproject.org
user: root user: root
gather_facts: True gather_facts: True

4
playbooks/groups/buildvm.yml
View file

@ -167,7 +167,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure varnish cache - 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: tags:
- varnish - varnish
user: root user: root
@ -185,7 +185,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure sshfs on buildvm-s390x-01 - 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: tags:
- sshfs - sshfs
user: root user: root

2
playbooks/groups/os-cluster.yml
View file

@ -1,5 +1,5 @@
# create an os server # 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 - name: make the box be real
hosts: os_control:os_control_stg:os_masters_stg:os_nodes_stg:os_masters:os_nodes hosts: os_control:os_control_stg:os_masters_stg:os_nodes_stg:os_masters:os_nodes

2
playbooks/groups/postgresql-server.yml
View file

@ -7,7 +7,7 @@
# Once the instance exists, configure it. # Once the instance exists, configure it.
- name: configure postgresql server system - 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 user: root
gather_facts: True gather_facts: True

2
playbooks/groups/proxies.yml
View file

@ -1,6 +1,6 @@
# create a new proxy server # 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 - name: make the box be real
hosts: proxies_stg:proxies hosts: proxies_stg:proxies

4
playbooks/groups/simple-koji-ci.yml
View file

@ -1,5 +1,5 @@
- name: check/create instance - 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 gather_facts: False
vars_files: vars_files:
@ -15,7 +15,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things - 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 gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

2
playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
View file

@ -1,7 +1,7 @@
# This is a basic playbook # This is a basic playbook
- name: make cloud noc hardware - name: make cloud noc hardware
hosts: cloud_noc01.cloud.fedoraproject.org hosts: cloud-noc01.cloud.fedoraproject.org
user: root user: root
gather_facts: True gather_facts: True

4
playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
View file

@ -1,7 +1,7 @@
# This is a basic playbook # This is a basic playbook
- name: dole out the generic configuration - name: dole out the generic configuration
hosts: data_analysis01.phx2.fedoraproject.org hosts: data-analysis01.phx2.fedoraproject.org
user: root user: root
gather_facts: True gather_facts: True
@ -38,7 +38,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: dole out the service-specific config - name: dole out the service-specific config
hosts: data_analysis01.phx2.fedoraproject.org hosts: data-analysis01.phx2.fedoraproject.org
user: root user: root
gather_facts: True gather_facts: True
vars_files: vars_files:

35
playbooks/hosts/elastic-dev.fedorainfracloud.org.yml
View file

@ -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"

4
playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
View file

@ -1,5 +1,5 @@
- name: check/create instance - name: check/create instance
hosts: fas2_dev.fedorainfracloud.org hosts: fas2-dev.fedorainfracloud.org
gather_facts: False gather_facts: False
vars_files: vars_files:
@ -15,7 +15,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things - name: setup all the things
hosts: fas2_dev.fedorainfracloud.org hosts: fas2-dev.fedorainfracloud.org
gather_facts: True gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

2
playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
View file

@ -18,7 +18,7 @@
authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}"
- name: deploy Open Stack controler - name: deploy Open Stack controler
hosts: fed_cloud09.cloud.fedoraproject.org hosts: fed-cloud09.cloud.fedoraproject.org
gather_facts: True gather_facts: True
vars: vars:

4
playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
View file

@ -1,5 +1,5 @@
- name: check/create instance - name: check/create instance
hosts: fedimg_dev.fedorainfracloud.org hosts: fedimg-dev.fedorainfracloud.org
gather_facts: False gather_facts: False
vars_files: vars_files:
@ -15,7 +15,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things - name: setup all the things
hosts: fedimg_dev.fedorainfracloud.org hosts: fedimg-dev.fedorainfracloud.org
gather_facts: True gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

4
playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml
View file

@ -1,5 +1,5 @@
- name: check/create instance - name: check/create instance
hosts: fedora_bootstrap.fedorainfracloud.org hosts: fedora-bootstrap.fedorainfracloud.org
gather_facts: False gather_facts: False
vars_files: vars_files:
@ -15,7 +15,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things - name: setup all the things
hosts: fedora_bootstrap.fedorainfracloud.org hosts: fedora-bootstrap.fedorainfracloud.org
gather_facts: True gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

4
playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml
View file

@ -1,5 +1,5 @@
- name: check/create instance - name: check/create instance
hosts: glittergallery_dev.fedorainfracloud.org hosts: glittergallery-dev.fedorainfracloud.org
gather_facts: False gather_facts: False
vars_files: vars_files:
@ -15,7 +15,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things - name: setup all the things
hosts: glittergallery_dev.fedorainfracloud.org hosts: glittergallery-dev.fedorainfracloud.org
gather_facts: True gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

67
playbooks/hosts/hubs-dev.fedorainfracloud.org.yml
View file

@ -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

4
playbooks/hosts/lists-dev.fedorainfracloud.org.yml
View file

@ -1,5 +1,5 @@
- name: check/create instance - name: check/create instance
hosts: lists_dev.fedorainfracloud.org hosts: lists-dev.fedorainfracloud.org
gather_facts: False gather_facts: False
vars_files: vars_files:
@ -15,7 +15,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things - name: setup all the things
hosts: lists_dev.fedorainfracloud.org hosts: lists-dev.fedorainfracloud.org
gather_facts: True gather_facts: True
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml