summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-11-01 11:46:18 +0800
committerYifei Xue <xueyifei@huawei.com>2017-11-28 21:39:19 +0800
commit10361fd56fac5f7aebba44402bf9a501854d00c3 (patch)
tree205b76c0831e272e71dbef64c3c10ea332f13eea /deploy/conf
parent9a76ddb1075479c891389a0c9303d80ead9895a0 (diff)
Upgrade OpenStack version from Ocata to Pike
JIRA: COMPASS-565 For OPNFV F release, it's going to use OpenStack Pike as the NFVI component. This task is created to monitor the upgrade work of OpenStack Pike. Subtasks as follow: - Add Pike related configurations to compass_conf - Upgrade ubuntu os to ubuntu 16.04.3 - Upgrade centos os to centos 7.4 - Upgrade openstack-ansible from ocata to pike - Upgrade openstack repos from ocata to pike Change-Id: I2202e8e3ae23dae8e575c89170c9e5e057757870 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/cluster.conf8
-rw-r--r--deploy/conf/compass.conf6
2 files changed, 8 insertions, 6 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index c9e565ad..750ff113 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -3,13 +3,13 @@ export OS_VERSION=${OS_VERSION:-"xenial"}
# for Operating System
if [ $OS_VERSION = 'xenial' ]; then
- export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-16\.04'}
+ export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-16\.04\.3'}
else
- export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*16.*'}
+ export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*17.*'}
fi
-# ocata
-export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"ocata"}
+# pike
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"pike"}
# don't touch this
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index dc3a975e..8a3bb3a3 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -22,13 +22,15 @@ export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-compass4nfv}
export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
-export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
+# export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
+export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa"
if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
fi
-export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
+# export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db"
export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq"
export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates"
+export COMPASS_COBBLER="yifei0van0xue/compass-cobbler"