Fix bifrost deployment after removal of env-vars

Change-Id: I1318a5ea7f746012cc3055d4c03fd0508df921ff

ansible/roles/bifrost/tasks/bootstrap.yml

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

ansible/roles/bifrost/tasks/deploy-servers.yml

@@ -3,7 +3,7 @@
   become: true
   command: >
      docker exec bifrost_deploy
-     bash -c 'source /bifrost/env-vars &&
+     bash -c 'export OS_CLOUD=bifrost &&
      export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
      ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
      /bifrost/playbooks/enroll-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
@@ -12,7 +12,7 @@
   become: true
   command: >
      docker exec bifrost_deploy
-     bash -c 'source /bifrost/env-vars &&
+     bash -c 'export OS_CLOUD=bifrost &&
      export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
      ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
      /bifrost/playbooks/deploy-dynamic.yaml -e @/etc/bifrost/bifrost.yml'

doc/source/reference/deployment-and-bootstrapping/bifrost.rst

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