4 files changed, 15 insertions, 1 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index bccc64d4..be5d17c3 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -15,4 +15,11 @@ export NTP_SERVER="$COMPASS_SERVER"
 export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
 export COMPASS_REPO_PORT="5151"
 export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
-export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks,compass-cobbler]"
+
+if [[ "x"$COMPOSE_IMAGES == "x" && "x"$OPENSTACK_VERSION != "x" ]]; then
+    export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks-osa,compass-cobbler]"
+fi
+
+if [[ "x"$COMPOSE_IMAGES == "x" && "x"$KUBERNETES_VERSION != "x" ]]; then
+    export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks-k8s,compass-cobbler]"
+fi
diff --git a/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml
index 995d0107..2cedcf4d 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml
@@ -25,6 +25,7 @@ hosts:
     roles:
       - kube_master
       - etcd
+      - ha
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -35,6 +36,7 @@ hosts:
     roles:
       - kube_master
       - etcd
+      - ha
 
   - name: host3
     mac: '78:D7:52:A0:B1:99'
@@ -45,6 +47,7 @@ hosts:
     roles:
       - kube_master
       - etcd
+      - ha
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'
diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf
index 9661e199..dcee7d30 100644
--- a/deploy/conf/virtual.conf
+++ b/deploy/conf/virtual.conf
@@ -12,3 +12,4 @@ export SWITCH_IPS="1.1.1.1"
 export SWITCH_CREDENTIAL="version=2c,community=public"
 export DEPLOYMENT_TIMEOUT="300"
 export POLL_SWITCHES_FLAG="nopoll_switches"
+export NAT_EXTERNAL=${NAT_EXTERNAL:true}
diff --git a/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml b/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
index 003f41be..42262057 100644
--- a/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
@@ -16,16 +16,19 @@ hosts:
     roles:
       - kube_master
       - etcd
+      - ha
 
   - name: host2
     roles:
       - kube_master
       - etcd
+      - ha
 
   - name: host3
     roles:
       - kube_master
       - etcd
+      - ha
 
   - name: host4
     roles: