summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/cluster.conf6
-rw-r--r--deploy/conf/five.conf4
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"