Merge "add deploy-servers command"3.0.0.0b3

1 files changed, 13 insertions, 6 deletions

diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 5e4380d79..941c49a46 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -42,9 +42,11 @@ Commands:
     prechecks           Do pre-deployment checks for hosts
     mariadb_recovery    Recover a completely stopped mariadb cluster
     bootstrap-servers   bootstrap servers with kolla deploy dependencies
-    deploy              Deploy and start all kolla containers
     destroy             Destroy Kolla containers, volumes and host configuration
                         ('-e destroy_include_images=yes' to also destroy Kolla images)
+    deploy              Deploy and start all kolla containers
+    deploy-bifrost      Deploy and start bifrost container
+    deploy-servers      Enroll and deploy servers with bifrost
     post-deploy         Do post deploy on deploy node
     pull                Pull all images for containers (only pulls, no running container changes)
     reconfigure         Reconfigure OpenStack service
@@ -161,18 +163,23 @@ EOF
         fi
         ;;
 (bootstrap-servers)
-        ACTION="Deploying Playbooks"
+        ACTION="Bootstraping servers"
         PLAYBOOK="${BASEDIR}/ansible/kolla-host.yml"
         EXTRA_OPTS="$EXTRA_OPTS -e action=bootstrap-servers"
         ;;
-(bifrost-deploy)
+(deploy)
+        ACTION="Deploying Playbooks"
+        EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
+        ;;
+(deploy-bifrost)
         ACTION="Deploying Bifrost"
         PLAYBOOK="${BASEDIR}/ansible/bifrost.yml"
         EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
         ;;
-(deploy)
-        ACTION="Deploying Playbooks"
-        EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
+(deploy-servers)
+        ACTION="Deploying servers with bifrost"
+        PLAYBOOK="${BASEDIR}/ansible/bifrost.yml"
+        EXTRA_OPTS="$EXTRA_OPTS -e action=deploy-servers"
         ;;
 (post-deploy)
         ACTION="Post-Deploying Playbooks"