diff options
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/base.conf | 3 | ||||
| -rw-r--r-- | deploy/conf/cluster.conf | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 540efec7..f009a4ac 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -1,3 +1,6 @@ +export DHA=${DHA:-$COMPASS_DIR/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml} +export NEUTRON=${NEUTRON:-$COMPASS_DIR/deploy/conf/neutron_cfg.yaml} +export NETWORK=${NETWORK:-$COMPASS_DIR/deploy/conf/network_cfg.yaml} export ISO_URL=${ISO_URL:-file://`pwd`/work/building/compass.iso} export INSTALL_IP=${INSTALL_IP:-10.1.0.12} export INSTALL_MASK=${INSTALL_MASK:-255.255.255.0} diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index f741895b..cae78be3 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -1,10 +1,13 @@ -# for Operating System -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'} -#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} - # trustry/centos7 export OS_VERSION=${OS_VERSION:-"trusty"} +# for Operating System +if [ $OS_VERSION = 'trusty' ];then + export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'} +else + export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} +fi + # liberty/kilo/juno export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"} |