diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-01-27 14:34:59 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2018-01-31 09:44:47 +0800 |
| commit | 4281121d0ce6240fa3928d2a2256fb621581b7ac (patch) | |
| tree | 0063fc1a30ec1f6ebc3f9cbfc3ac942d31c22a1a /deploy/conf | |
| parent | 2c93fa28f1f1e78f4135f096f0c59e82963fd847 (diff) | |
Seperate compass-tasks
JIRA: -
1. Keep openstack-ansible in compass-tasks-osa.
Keep kubespray in compass-tasks-k8s. Build
different compass-tasks in one tar ball. Identify
which one to use during docker-compose.
2. Temporarily using private docker repo.
3. COMPOSE_IMAGES is used to controll which components
to form compass-core regardless of specific repo. Set
default value for openstack and kubernetes when perform
single cluster deploy.
Change-Id: Ief52580e954c602575c9bf8abe5733c100876c7f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/compass.conf | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index 9d9145f1..33fd6200 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -17,4 +17,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 |