summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/main.yml2
-rw-r--r--deploy/conf/cluster.conf12
2 files changed, 12 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml
index f06ce193..2254f11f 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml
@@ -9,6 +9,8 @@
include: openvswitch.yml
when: groups['odl']|length !=0 and inventory_hostname not in groups['odl']
+- meta: flush_handlers
+
- name: check out new flow table if enable
shell: ovs-ofctl --protocol=OpenFlow13 dump-flows br-prv | grep CONTROLLER; while [ $? -ne 0 ]; do sleep 10; ovs-ofctl --protocol=OpenFlow13 dump-flows br-prv | grep CONTROLLER; done
when: groups['odl']|length !=0
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 200fae65..09a8aae4 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,17 +1,25 @@
+# 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.*1503-01.*'}
+
+# don't touch this
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
+
+# for openstack juno
export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
export ADAPTER_NAME="openstack_juno"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno"
+
+
+# for openstack kilo
#export REPO_NAME=${REPO_NAME:-"trusty-liberty-ppa"}
#export ADAPTER_NAME="openstack_liberty"
#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-liberty"
-#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
+# for openstack kilo on Centos7
#export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"}
#export ADAPTER_NAME="openstack_kilo"
-#export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-kilo"
export DEFAULT_ROLES=""