commit c0838ab6a6fe6275cbb44289fd0a221d202eeec0 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Mon Mar 2 13:13:14 2020 +0100 Update inventory/groups .../group_vars/{bodhi-backend => bodhi_backend} | 0 .../group_vars/{postgresql-server => dbserver} | 0 .../group_vars/{releng-compose => releng_compose} | 0 inventory/group_vars/{sign-vault => sign_vault} | 0 .../group_vars/{virthost-comm => virthost_comm} | 0 inventory/inventory | 23 ++++++++----------- playbooks/groups/bodhi-backend.yml | 10 ++++---- playbooks/groups/mailman.yml | 10 ++++---- playbooks/manual/sign-vault.yml | 6 ++-- 9 files changed, 23 insertions(+), 26 deletions(-) --- diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi_backend similarity index 100% rename from inventory/group_vars/bodhi-backend rename to inventory/group_vars/bodhi_backend diff --git a/inventory/group_vars/postgresql-server b/inventory/group_vars/dbserver similarity index 100% rename from inventory/group_vars/postgresql-server rename to inventory/group_vars/dbserver diff --git a/inventory/group_vars/releng-compose b/inventory/group_vars/releng_compose similarity index 100% rename from inventory/group_vars/releng-compose rename to inventory/group_vars/releng_compose diff --git a/inventory/group_vars/sign-vault b/inventory/group_vars/sign_vault similarity index 100% rename from inventory/group_vars/sign-vault rename to inventory/group_vars/sign_vault diff --git a/inventory/group_vars/virthost-comm b/inventory/group_vars/virthost_comm similarity index 100% rename from inventory/group_vars/virthost-comm rename to inventory/group_vars/virthost_comm diff --git a/inventory/inventory b/inventory/inventory index dc7a0c2..198631b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -4,9 +4,9 @@ bastion02.linaro.rpmfusion.net bastion03.virt.rpmfusion.net [bodhi2] -bodhi01.online.rpmfusion.net +#bodhi01.online.rpmfusion.net -[bodhi-backend] +[bodhi_backend] bodhi-backend01.online.rpmfusion.net [bugzilla] @@ -32,16 +32,15 @@ koji01.online.rpmfusion.net [mailman] se01.online.rpmfusion.net -[mailman-stg] +[mailman_stg] -[mailman-db] +[mailman_db] db02.online.rpmfusion.net -[mailman-stg] +[mailman_stg] [moin] moin01.online.rpmfusion.net -test01.online.rpmfusion.net [pkgdb] pkgdb02.online.rpmfusion.net @@ -51,21 +50,19 @@ pkgs01.online.rpmfusion.net [proxies] -[releng-compose] +[releng_compose] bodhi-backend01.online.rpmfusion.net -[sign-bridge] +[sign_bridge] koji01.online.rpmfusion.net -[sign-vault] -sign-vault01.online.rpmfusion.net +[sign_vault] +sign-vault01.online.rpmfusion.net ansible_ssh_user=root [squid] hv01.online.rpmfusion.net -proxy01.scaleway.rpmfusion.net bastion02.linaro.rpmfusion.net ansible_become=yes ansible_ssh_user=cloud-user ansible_python_interpreter=/usr/bin/python3 bastion03.virt.rpmfusion.net -buildppc-01.osuosl.rpmfusion.net buildppcle-01.osuosl.rpmfusion.net buildppcle-02.osuosl.rpmfusion.net @@ -79,7 +76,7 @@ hv01.online.rpmfusion.net [scaleway] mirrorlist03.scaleway.rpmfusion.net proxy01.scaleway.rpmfusion.net -test01.scaleway.rpmfusion.net +#test01.scaleway.rpmfusion.net [virtservers:children] virthost diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index e6c8bf9..5360393 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -1,16 +1,16 @@ -# create a new bodhi-backend system +# create a new bodhi_backend system # -# This group makes bodhi-backend servers. +# This group makes bodhi_backend servers. # They are used by releng to push updates with bodhi. # They also run some misc releng scripts. # -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi-backend:bodhi-backend-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi_backend:bodhi_backend-stg" # Once the instance exists, configure it. -- name: make bodhi-backend server system - hosts: bodhi-backend:bodhi-backend-stg +- name: make bodhi_backend server system + hosts: bodhi_backend:bodhi_backend-stg user: root gather_facts: True diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index e978061..058e037 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -2,10 +2,10 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman_stg" - name: make the box be real - hosts: mailman-stg:mailman + hosts: mailman_stg:mailman user: root gather_facts: True @@ -41,7 +41,7 @@ # - name: prepare setting up the database - hosts: mailman-db-stg:mailman-db + hosts: mailman_db-stg:mailman_db gather_facts: no user: root @@ -52,7 +52,7 @@ - packages - name: setup the database - hosts: mailman-db-stg:mailman-db + hosts: mailman_db-stg:mailman_db gather_facts: no become: yes become_user: postgres @@ -81,7 +81,7 @@ # Real MM/HK-specific work - name: setup mailman and hyperkitty - hosts: mailman-stg:mailman + hosts: mailman_stg:mailman user: root gather_facts: True diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index e73a4fa..6b15a51 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -6,8 +6,8 @@ # Access is via management interface only. This playbook does initial setup. # Please check with rel-eng before doing anything here. -- name: make sign-vault server vm (secondary and stg only) - hosts: sign-vault +- name: make sign_vault server vm (secondary and stg only) + hosts: sign_vault user: root gather_facts: False @@ -23,7 +23,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: make sign vault server - hosts: sign-vault + hosts: sign_vault user: root gather_facts: true