openstack/kolla-ansible
Code Issues Proposed changes

Fix bifrost deployment after removal of env-vars

Browse Source 
Change-Id: I1318a5ea7f746012cc3055d4c03fd0508df921ff
This commit is contained in:
Michal Nasiadka 2020-08-28 10:18:41 +02:00
parent fa48cc7eaf
commit 8464046eac
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@
become: true become: true
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target 'ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target
/bifrost/playbooks/install.yaml -e @/etc/bifrost/bifrost.yml /bifrost/playbooks/install.yaml -e @/etc/bifrost/bifrost.yml
-e @/etc/bifrost/dib.yml -e skip_package_install=true' -e @/etc/bifrost/dib.yml -e skip_package_install=true'

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

@ -3,7 +3,7 @@
become: true become: true
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c 'export OS_CLOUD=bifrost &&
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'
@ -12,7 +12,7 @@
become: true become: true
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c 'export OS_CLOUD=bifrost &&
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'

8
doc/source/reference/deployment-and-bootstrapping/bifrost.rst
View File

@ -345,7 +345,7 @@ Deploy Bifrost manually
cd /bifrost cd /bifrost
./scripts/env-setup.sh ./scripts/env-setup.sh
. env-vars export OS_CLOUD=bifrost
cat > /etc/rabbitmq/rabbitmq-env.conf << EOF cat > /etc/rabbitmq/rabbitmq-env.conf << EOF
HOME=/var/lib/rabbitmq HOME=/var/lib/rabbitmq
EOF EOF
@ -363,7 +363,7 @@ Validate the Deployed Container
docker exec -it bifrost_deploy bash docker exec -it bifrost_deploy bash
cd /bifrost cd /bifrost
. env-vars export OS_CLOUD=bifrost
Running "ironic node-list" should return with no nodes, for example Running "ironic node-list" should return with no nodes, for example
@ -405,7 +405,7 @@ Manually
docker exec -it bifrost_deploy bash docker exec -it bifrost_deploy bash
cd /bifrost cd /bifrost
. env-vars export OS_CLOUD=bifrost
export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml
ansible-playbook -vvvv \ ansible-playbook -vvvv \
-i /bifrost/playbooks/inventory/bifrost_inventory.py \ -i /bifrost/playbooks/inventory/bifrost_inventory.py \
@ -415,7 +415,7 @@ Manually
docker exec -it bifrost_deploy bash docker exec -it bifrost_deploy bash
cd /bifrost cd /bifrost
. env-vars export OS_CLOUD=bifrost
export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml
ansible-playbook -vvvv \ ansible-playbook -vvvv \
-i /bifrost/playbooks/inventory/bifrost_inventory.py \ -i /bifrost/playbooks/inventory/bifrost_inventory.py \