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

blockerbugs: inherit group vars correctly for openshift app

Browse source 
Signed-off-by: Mark O Brien <markobri@redhat.com>
This commit is contained in:
Mark O Brien 2022-02-02 20:13:39 +00:00
parent 5d906f9b8c
commit 87a2e19ade
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/inventory
View file

@ -69,9 +69,11 @@ bastion13.fedoraproject.org
[blockerbugs] [blockerbugs]
blockerbugs01.iad2.fedoraproject.org blockerbugs01.iad2.fedoraproject.org
os-control01.iad2.fedoraproject.org
[blockerbugs_stg] [blockerbugs_stg]
blockerbugs01.stg.iad2.fedoraproject.org blockerbugs01.stg.iad2.fedoraproject.org
os-control01.stg.iad2.fedoraproject.org
[centos_ipa_client_stg] [centos_ipa_client_stg]
centos-ipa-client01.stg.iad2.fedoraproject.org centos-ipa-client01.stg.iad2.fedoraproject.org

4
playbooks/groups/blockerbugs.yml
View file

@ -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 - name: make the box be real
hosts: blockerbugs:blockerbugs_stg hosts: blockerbugs01.iad2.fedoraproject.org:blockerbugs01.stg.iad2.fedoraproject.org
user: root user: root
gather_facts: True gather_facts: True

4
playbooks/openshift-apps/blockerbugs.yml
View file

@ -22,10 +22,6 @@
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
tasks: 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 - name: Create the database user
postgresql_user: postgresql_user:
name: "{{ blockerbugs_db_user }}" name: "{{ blockerbugs_db_user }}"