diff options
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/cluster.conf | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index 9107eb8a..ad21dcd8 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -1,33 +1,20 @@ -# trustry/centos7 -export OS_VERSION=${OS_VERSION:-"trusty"} +# xenial/centos7 +export OS_VERSION=${OS_VERSION:-"xenial"} # for Operating System if [ $OS_VERSION = 'xenial' ]; then export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-16\.04'} -elif [ $OS_VERSION = 'trusty' ]; then - export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'} -elif [ $OS_VERSION = 'redhat7' ]; then - export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)rhel-server-7\.2.*'} else export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} fi -# liberty/kilo/juno -export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"} +# newton +export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"newton"} # don't touch this export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" -if [ $OPENSTACK_VERSION = 'mitaka_xenial' ]; then - export REPO_NAME="xenial-mitaka-ppa" -elif [ $OPENSTACK_VERSION = 'newton_xenial' ]; then - export REPO_NAME="xenial-newton-ppa" -elif [ $OPENSTACK_VERSION = 'osp9' ]; then - unset REPO_NAME -else - export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa" -fi - +export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa" export ADAPTER_NAME="openstack_$OPENSTACK_VERSION" export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION" |