Merge "Fix tacker"

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index e9930fa..839fdfb 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -53,7 +53,7 @@ done
 
 # tar up the congress puppet module
 rm -rf puppet-congress
-git clone https://github.com/radez/puppet-congress
+git clone -b stable/mitaka https://github.com/radez/puppet-congress
 pushd puppet-congress > /dev/null
 git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz
 popd > /dev/null

diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 6e85fa2..286b516 100644 (file)
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false

diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index cfdc5dd..2d1b44a 100644 (file)
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false

diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml
index 739b3e3..11b093f 100644 (file)
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ b/config/deploy/os-nosdn-ovs-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   dataplane: ovs_dpdk

diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml
index 9cb783d..3082dcb 100644 (file)
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ b/config/deploy/os-nosdn-ovs-noha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   dataplane: ovs_dpdk

diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml
index c975e24..acbc1d3 100644 (file)
--- a/config/deploy/os-nosdn-performance-ha.yaml
+++ b/config/deploy/os-nosdn-performance-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vsperf: false

diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
index 710a0be..4ad1ee2 100644 (file)
--- a/config/deploy/os-ocl-nofeature-ha.yaml
+++ b/config/deploy/os-ocl-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opencontrail
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false

diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
index 7350777..1d29c2b 100644 (file)
--- a/config/deploy/os-odl_l2-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   tacker: false
-  congress: false
+  congress: true
   sfc: false
   vpn: true

diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
index e0f2669..b6b073f 100644 (file)
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@ -6,7 +6,7 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vpp: true

diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml
index 9fc896b..f323e2c 100644 (file)
--- a/config/deploy/os-odl_l2-fdio-noha.yaml
+++ b/config/deploy/os-odl_l2-fdio-noha.yaml
@@ -6,7 +6,7 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vpp: true

diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index e614fd4..4c88eeb 100644 (file)
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -6,6 +6,6 @@ deploy_options:
   sdn_l3: false
   odl_version: beryllium
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false

diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
index ca35a0f..f6904f0 100644 (file)
--- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: true

diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml
index e8f3f98..fa9a786 100644 (file)
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ b/config/deploy/os-odl_l2-sfc-noha.yaml
@@ -6,6 +6,6 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: true
   vpn: false

diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
index 4765045..e54f28b 100644 (file)
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false

diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
index 1de5229..0d083dd 100644 (file)
--- a/config/deploy/os-onos-nofeature-ha.yaml
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: onos
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false

diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml
index e0c8d9e..f0b7851 100644 (file)
--- a/config/deploy/os-onos-sfc-ha.yaml
+++ b/config/deploy/os-onos-sfc-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: onos
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: true
   vpn: false