diff options
| -rw-r--r-- | deploy/conf/cluster.conf | 2 | ||||
| -rw-r--r-- | deploy/conf/compass.conf | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index 0d947100..5178964c 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -10,6 +10,7 @@ fi # pike export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"pike"} +export DEPLOY_TOOL=${DEPLOY_TOOL:-"osa"} # don't touch this export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" @@ -25,6 +26,7 @@ export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION" if [[ "x"$KUBERNETES_VERSION != "x" ]]; then unset OPENSTACK_VERSION + export DEPLOY_TOOL=${DEPLOY_TOOL:-"k8s"} export ADAPTER_NAME=kubernetes export ADAPTER_FLAVOR_PATTERN=ansible-kubernetes export ADAPTER_TARGET_SYSTEM_PATTERN='^kubernetes$' diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index be5d17c3..b031c035 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -16,10 +16,6 @@ export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"} export COMPASS_REPO_PORT="5151" export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'} -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]" +if [[ "x"$COMPOSE_IMAGES == "x" ]]; then + export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks-$DEPLOY_TOOL,compass-cobbler]" fi |