openstack/kolla-ansible
Code Issues Proposed changes

Merge "Stabilise Bifrost CI job"

Browse Source
This commit is contained in:
Zuul 2018-08-07 11:29:03 +00:00 committed by Gerrit Code Review
commit 8247b6f3e4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/bifrost/tasks/bootstrap.yml
View File

@ -15,7 +15,7 @@
- name: Bootstrap bifrost (this may take several minutes) - name: Bootstrap bifrost (this may take several minutes)
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c '/bifrost/scripts/env-setup.sh && source /bifrost/env-vars bash -c 'source /bifrost/env-vars
&& cp /etc/bifrost/rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf && && cp /etc/bifrost/rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf &&
chown rabbitmq:rabbitmq /etc/rabbitmq/rabbitmq-env.conf && chown rabbitmq:rabbitmq /etc/rabbitmq/rabbitmq-env.conf &&
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target

6
ansible/roles/bifrost/tasks/deploy-servers.yml
View File

@ -2,8 +2,7 @@
- name: Enrolling physical servers with ironic - name: Enrolling physical servers with ironic
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars bash -c 'source /bifrost/env-vars &&
&& source /opt/stack/ansible/hacking/env-setup &&
export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml && export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
/bifrost/playbooks/enroll-dynamic.yaml -e @/etc/bifrost/bifrost.yml' /bifrost/playbooks/enroll-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
@ -11,8 +10,7 @@
- name: Deploy physical servers with ironic - name: Deploy physical servers with ironic
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars bash -c 'source /bifrost/env-vars &&
&& source /opt/stack/ansible/hacking/env-setup &&
export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml && export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
/bifrost/playbooks/deploy-dynamic.yaml -e @/etc/bifrost/bifrost.yml' /bifrost/playbooks/deploy-dynamic.yaml -e @/etc/bifrost/bifrost.yml'