summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-03-28 12:43:59 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-03-28 12:43:59 +0000
commit1a358b5d032968b410138fb904aae37a9637ed84 (patch)
treec51b879d40094a37ac6066c9a6182ef57439d2cb
parentac41ffe55ab676f4dceb317f28707261f63f615a (diff)
parent7568d76abdc6759e511f0b7b48a48738dcc53c01 (diff)
Merge topic 'sfc_coexist_fix' into stable/brahmaputra
* changes: Fixes SFC coexist table issue with compute node Adds L3 agent for no-sdn no-ha scenario
-rw-r--r--build/opnfv-tripleo-heat-templates.patch44
1 files changed, 29 insertions, 15 deletions
diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch
index f75c430..91a27d1 100644
--- a/build/opnfv-tripleo-heat-templates.patch
+++ b/build/opnfv-tripleo-heat-templates.patch
@@ -1,4 +1,4 @@
-From d86b6e5cc493645e01484a1ea6cfff29cce2fa3d Mon Sep 17 00:00:00 2001
+From 373da7eae018f52097d96fe18898d035e53b354d Mon Sep 17 00:00:00 2001
From: Tim Rozet <tdrozet@gmail.com>
Date: Tue, 12 Jan 2016 16:49:57 -0500
Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
@@ -18,12 +18,12 @@ Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
puppet/controller.yaml | 93 ++++-
puppet/hieradata/common.yaml | 1 +
puppet/hieradata/controller.yaml | 5 +-
- puppet/manifests/overcloud_compute.pp | 31 +-
- puppet/manifests/overcloud_controller.pp | 128 +++++-
+ puppet/manifests/overcloud_compute.pp | 47 ++-
+ puppet/manifests/overcloud_controller.pp | 126 +++++-
puppet/manifests/overcloud_controller_pacemaker.pp | 456 ++++++++++++++-------
puppet/manifests/overcloud_opendaylight.pp | 27 ++
puppet/opendaylight-puppet.yaml | 223 ++++++++++
- 19 files changed, 1105 insertions(+), 162 deletions(-)
+ 19 files changed, 1119 insertions(+), 162 deletions(-)
create mode 100644 environments/onos.yaml
create mode 100644 environments/opendaylight-external.yaml
create mode 100644 environments/opendaylight.yaml
@@ -868,10 +868,10 @@ index 4b7fd81..7dbc2e9 100644
tripleo::loadbalancer::heat_cloudwatch: true
tripleo::loadbalancer::heat_cfn: true
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
-index cd41cc7..110ca1d 100644
+index cd41cc7..b6dc2fe 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
-@@ -75,9 +75,34 @@ class { '::neutron::plugins::ml2':
+@@ -75,9 +75,50 @@ class { '::neutron::plugins::ml2':
tenant_network_types => [hiera('neutron_tenant_network_type')],
}
@@ -887,6 +887,22 @@ index cd41cc7..110ca1d 100644
+ $opendaylight_controller_ip = hiera('opendaylight_controller_ip')
+ }
+
++ # co-existence hacks for SFC
++ if hiera('opendaylight_features', 'odl-ovsdb-openstack') =~ /odl-ovsdb-sfc-rest/ {
++ $opendaylight_port = hiera('opendaylight_port')
++ $odl_username = hiera('opendaylight_username')
++ $odl_password = hiera('opendaylight_password')
++ $sfc_coexist_url = "http://${opendaylight_controller_ip}:${opendaylight_port}/restconf/config/sfc-of-renderer:sfc-of-renderer-config"
++ # Coexist for SFC
++ exec { 'Check SFC table offset has been set':
++ command => "curl --fail --silent -u ${odl_username}:${odl_password} ${sfc_coexist_url} | grep :11 > /dev/null",
++ tries => 15,
++ try_sleep => 60,
++ path => '/usr/sbin:/usr/bin:/sbin:/bin',
++ before => Class['neutron::plugins::ovs::opendaylight'],
++ }
++ }
++
+ class { 'neutron::plugins::ovs::opendaylight':
+ odl_controller_ip => $opendaylight_controller_ip,
+ tunnel_ip => hiera('neutron::agents::ml2::ovs::local_ip'),
@@ -910,7 +926,7 @@ index cd41cc7..110ca1d 100644
if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
-index 1f6c2be..1095758 100644
+index 1f6c2be..67a9f04 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -30,6 +30,21 @@ if hiera('step') >= 1 {
@@ -955,7 +971,7 @@ index 1f6c2be..1095758 100644
include ::neutron::agents::dhcp
include ::neutron::agents::metadata
-@@ -237,15 +253,101 @@ if hiera('step') >= 3 {
+@@ -237,15 +253,99 @@ if hiera('step') >= 3 {
require => Package['neutron'],
}
@@ -966,10 +982,8 @@ index 1f6c2be..1095758 100644
+ }
+ } else {
+ include ::neutron
-+ if 'opendaylight' in hiera('neutron_mechanism_drivers') {
-+ if ! str2bool(hiera('opendaylight_enable_l3', 'no')) {
-+ include ::neutron::agents::l3
-+ }
++ if ! ('opendaylight' in hiera('neutron_mechanism_drivers')) or ! str2bool(hiera('opendaylight_enable_l3', 'no')) {
++ include ::neutron::agents::l3
+ }
+ }
+
@@ -1060,7 +1074,7 @@ index 1f6c2be..1095758 100644
if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
include ::neutron::plugins::ml2::cisco::nexus1000v
-@@ -280,8 +382,6 @@ if hiera('step') >= 3 {
+@@ -280,8 +380,6 @@ if hiera('step') >= 3 {
}
Service['neutron-server'] -> Service['neutron-dhcp-service']
@@ -1069,7 +1083,7 @@ index 1f6c2be..1095758 100644
Service['neutron-server'] -> Service['neutron-metadata']
include ::cinder
-@@ -447,6 +547,20 @@ if hiera('step') >= 3 {
+@@ -447,6 +545,20 @@ if hiera('step') >= 3 {
Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
@@ -1956,5 +1970,5 @@ index 0000000..6488e0e
+ - - {get_attr: [OpenDaylightDeployment, deploy_stdout]}
+ - {get_param: UpdateIdentifier}
--
-1.8.3.1
+2.5.0