summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2015-12-02 01:20:22 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-02 01:20:22 +0000
commit59f12c1119da51446dcddc84c903e385645632e5 (patch)
treee4e58abbaf13feae8bdd6c781b527022b33442b4 /deploy/conf
parent59450840d28991bef93ffe893fd5cde4173c1ad2 (diff)
parente93d595baf9b3fbbc0ec213ad725ce438772d8a4 (diff)
Merge "support libverty on ubuntu"
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/cluster.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 39e6d467..200fae65 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,8 +1,12 @@
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
+export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
+
export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
export ADAPTER_NAME="openstack_juno"
-export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno"
+#export REPO_NAME=${REPO_NAME:-"trusty-liberty-ppa"}
+#export ADAPTER_NAME="openstack_liberty"
+#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-liberty"
#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
#export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"}