Merge "Remove the variable redefined in deploy-servers.yml"

This commit is contained in:
Jenkins 2017-04-13 15:39:25 +00:00 committed by Gerrit Code Review
commit 62c5ba1e94

View File

@ -6,8 +6,7 @@
&& source /opt/stack/ansible/hacking/env-setup && && 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 "ansible_python_interpreter=/var/lib/kolla/venv/bin/python" /bifrost/playbooks/enroll-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
-e @/etc/bifrost/bifrost.yml'
- name: Deploy physical servers with ironic - name: Deploy physical servers with ironic
command: > command: >
@ -16,5 +15,4 @@
&& source /opt/stack/ansible/hacking/env-setup && && 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 "ansible_python_interpreter=/var/lib/kolla/venv/bin/python" /bifrost/playbooks/deploy-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
-e @/etc/bifrost/bifrost.yml'