summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-07-22 12:53:55 -0400
committerTim Rozet <trozet@redhat.com>2016-07-22 23:38:25 -0400
commite42b3b06dd15d71844fc7fc85a69459d4aa4fc65 (patch)
treea3244e532df2ce505038ec3cd2a53cf0170f832f
parent66f4a30987f870d5a6416b2c46c7dfb95130b4d9 (diff)
Fixes congress defaults and bind host
opnfv-tht-pr: 48 JIRA: APEX-206 Change-Id: Icfb5356252f4e862f8a9cd4fd1914951ab45baf4 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xbuild/overcloud-full.sh2
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml2
-rw-r--r--config/deploy/os-nosdn-ovs-ha.yaml2
-rw-r--r--config/deploy/os-nosdn-ovs-noha.yaml2
-rw-r--r--config/deploy/os-nosdn-performance-ha.yaml2
-rw-r--r--config/deploy/os-ocl-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-odl_l2-bgpvpn-ha.yaml2
-rw-r--r--config/deploy/os-odl_l2-fdio-ha.yaml2
-rw-r--r--config/deploy/os-odl_l2-fdio-noha.yaml2
-rw-r--r--config/deploy/os-odl_l2-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-odl_l2-sdnvpn-ha.yaml2
-rw-r--r--config/deploy/os-odl_l2-sfc-noha.yaml2
-rw-r--r--config/deploy/os-odl_l3-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-onos-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-onos-sfc-ha.yaml2
16 files changed, 16 insertions, 16 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 7eb22d1d..ef922a07 100755
--- 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 6e85fa20..286b5162 100644
--- 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 cfdc5dd3..2d1b44ad 100644
--- 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 739b3e3d..11b093f0 100644
--- 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 9cb783d3..3082dcb4 100644
--- 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 c975e24d..acbc1d34 100644
--- 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 710a0be9..4ad1ee2b 100644
--- 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 73507772..1d29c2bf 100644
--- 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 e0f26696..b6b073fc 100644
--- 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 9fc896b5..f323e2cd 100644
--- 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 e614fd49..4c88eeb3 100644
--- 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 ca35a0fe..f6904f05 100644
--- 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 e8f3f986..fa9a7868 100644
--- 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 47650459..e54f28b0 100644
--- 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 1de52298..0d083dda 100644
--- 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 e0c8d9e8..f0b78511 100644
--- 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