From cd3b3f047afa68284aeb9369d0390d0b382dc4ab Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Fri, 7 Sep 2018 16:59:23 -0500
Subject: [PATCH] Move bootstrap-ansible and passwords to run_osa tag

Allows for deployment/bootstrap of OSA to be skipped
by skipping run_osa while still allowing configuration
to be added during pre_config_osa.

Change-Id: I40b0c8209f03c7e9543c7c688f2ef8ba2ebdf72d
---
 multi-node-aio/playbooks/deploy-osa.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml
index 79283977..7ca06ab1 100644
--- a/multi-node-aio/playbooks/deploy-osa.yml
+++ b/multi-node-aio/playbooks/deploy-osa.yml
@@ -113,14 +113,14 @@
       args:
         chdir: /opt/openstack-ansible
       when:
-        - pre_config_osa | default(true) | bool
+        - run_osa | default(true) | bool
 
     - name: Create passwords
       command: ./scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
       args:
         chdir: /opt/openstack-ansible
       when:
-        - pre_config_osa | default(true) | bool
+        - run_osa | default(true) | bool
 
     - name: Config Tmux
       lineinfile: