From 87a2e19adef0d95855cdf5d66e8dd5fb115d6149 Mon Sep 17 00:00:00 2001 From: Mark O Brien Date: Wed, 2 Feb 2022 20:13:39 +0000 Subject: [PATCH] blockerbugs: inherit group vars correctly for openshift app Signed-off-by: Mark O Brien --- inventory/inventory | 2 ++ playbooks/groups/blockerbugs.yml | 4 ++-- playbooks/openshift-apps/blockerbugs.yml | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index a6651a4599..24fb0209f3 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -69,9 +69,11 @@ bastion13.fedoraproject.org [blockerbugs] blockerbugs01.iad2.fedoraproject.org +os-control01.iad2.fedoraproject.org [blockerbugs_stg] blockerbugs01.stg.iad2.fedoraproject.org +os-control01.stg.iad2.fedoraproject.org [centos_ipa_client_stg] centos-ipa-client01.stg.iad2.fedoraproject.org diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 69cc7337ce..a8c7c65970 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -1,7 +1,7 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs:blockerbugs_stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs01.iad2.fedoraproject.org:blockerbugs01.stg.iad2.fedoraproject.org" - name: make the box be real - hosts: blockerbugs:blockerbugs_stg + hosts: blockerbugs01.iad2.fedoraproject.org:blockerbugs01.stg.iad2.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index dd44d79a2d..1041387561 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -22,10 +22,6 @@ - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" tasks: - - include_vars: /srv/web/infra/ansible/inventory/group_vars/blockerbugs_stg - when: env == 'staging' - - include_vars: /srv/web/infra/ansible/inventory/group_vars/blockerbugs - when: env != 'staging' - name: Create the database user postgresql_user: name: "{{ blockerbugs_db_user }}"