diff options
| author |   baigk <baiguoku@huawei.com> | 2015-09-19 11:07:44 +0800 |
|---|---|---|
| committer | baigk <baiguoku@huawei.com> | 2015-09-19 16:57:18 +0800 |
| commit | 95e055a4582070548cb1632934fa18af7be76ced (patch) | |
| tree | 5e93d728bc3dc2e12d4794978ebf0fad477ac76f /deploy/conf | |
| parent | 952e99a21501899b5e2615443fd1518b9d316b2e (diff) | |
support to assign ppa name when deploy openstack
JIRA: COMPASS-63
Change-Id: Ifdaa8a82e849291c1b5d5a48f9f678f5bb417a89
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/cluster.conf | 6 | ||||
| -rw-r--r-- | deploy/conf/five.conf | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index 71fe0b76..b905957d 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -1,5 +1,7 @@ -export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*' -#export ADAPTER_OS_PATTERN='(?i)CentOS-7.*1503-01.*' +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" diff --git a/deploy/conf/five.conf b/deploy/conf/five.conf index 9abc3e9e..beff1c54 100644 --- a/deploy/conf/five.conf +++ b/deploy/conf/five.conf @@ -1,5 +1,7 @@ export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*' -#export ADAPTER_OS_PATTERN='(?i)CentOS-7.*1503-01.*' +#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="single-controller" |