summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-11-09 00:37:19 -0800
committerbaigk <baiguoku@huawei.com>2015-11-16 07:03:05 +0000
commitcb5ae68b968f28c1cedee3720ff14cf5fa1ab92c (patch)
tree74c81a96b8a76de1b5e67e4a2f7097f643ad6709 /deploy/conf
parente28554faea569b5e6d15b3816df702e664b5bba4 (diff)
suport installing openstack kilo on centos 7
JIRA: COMPASS-141 Change-Id: I8b4eeacd802124cd05d17c7c24682254f0c567f7 Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/cluster.conf11
1 files changed, 8 insertions, 3 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index b905957d..39e6d467 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,9 +1,14 @@
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
-#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
-#export REPO_NAME=${REPO_NAME:-"centos7-juno-ppa"}
export ADAPTER_NAME="openstack_juno"
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes"
+export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno"
+
+#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
+#export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"}
+#export ADAPTER_NAME="openstack_kilo"
+#export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
+#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-kilo"
+
export DEFAULT_ROLES=""
export VIP="10.1.0.222"