diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-09-12 08:40:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-12 08:40:59 +0000 |
| commit | 86af3f1897f0cc9b1231e6cbd9e302f5daf3f64c (patch) | |
| tree | 2c955b0c27d0c4175bce21671da0ac88fc76f465 /deploy/conf | |
| parent | 33bef552fb600e8f82cdfceb401337e2fa96553a (diff) | |
| parent | 6fec88cd73e388a14dcfdad812781667e5f9a668 (diff) | |
Merge "bug fix:support centos 7.1 deployment"
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/cluster.conf | 2 | ||||
| -rw-r--r-- | deploy/conf/five.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index 72602ea0..71fe0b76 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -1,5 +1,5 @@ export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*' -#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*' +#export ADAPTER_OS_PATTERN='(?i)CentOS-7.*1503-01.*' export ADAPTER_NAME="openstack_juno" export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes" diff --git a/deploy/conf/five.conf b/deploy/conf/five.conf index 32181b58..9abc3e9e 100644 --- a/deploy/conf/five.conf +++ b/deploy/conf/five.conf @@ -1,5 +1,5 @@ export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*' -#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*' +#export ADAPTER_OS_PATTERN='(?i)CentOS-7.*1503-01.*' export ADAPTER_NAME="openstack_juno" export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" export ADAPTER_FLAVOR_PATTERN="single-controller" |