diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-11-16 15:43:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-16 15:43:26 +0000 |
| commit | c3eb0aa24e4c4697f446f69b86a9cb159734e5f2 (patch) | |
| tree | 1cb47bdd2f5b7788092213a08ac7319a99df2898 /deploy/conf | |
| parent | a8aa85f2a26256938b0057802ac5521edb594791 (diff) | |
| parent | cb5ae68b968f28c1cedee3720ff14cf5fa1ab92c (diff) | |
Merge "suport installing openstack kilo on centos 7"
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/cluster.conf | 11 |
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" |