diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-03-24 20:01:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-24 20:01:50 +0000 |
| commit | e45742b51011e726f13739698bdae94594709ecd (patch) | |
| tree | d78d970acddb8879f99a87c13a6821c327c23973 /build/opnfv-tripleo-heat-templates.patch | |
| parent | 673897bcb5a8e1cb7a58941c8b6f7a4c0052c8fe (diff) | |
| parent | 89ac4d397e3a40cdfa2a807b89896c2a5e547634 (diff) | |
Merge "Adds L3 agent for no-sdn no-ha scenario"
Diffstat (limited to 'build/opnfv-tripleo-heat-templates.patch')
| -rw-r--r-- | build/opnfv-tripleo-heat-templates.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch index ba59e22d..648dba32 100644 --- a/build/opnfv-tripleo-heat-templates.patch +++ b/build/opnfv-tripleo-heat-templates.patch @@ -1,4 +1,4 @@ -From 516a741efddd1276d2b02010a7095737b6ce49cf Mon Sep 17 00:00:00 2001 +From ca87d09638f46ba49a866832030970bf43ade74e 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 @@ -19,12 +19,12 @@ Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support puppet/hieradata/common.yaml | 1 + puppet/hieradata/controller.yaml | 5 +- puppet/manifests/overcloud_compute.pp | 49 ++- - puppet/manifests/overcloud_controller.pp | 130 +++++- + puppet/manifests/overcloud_controller.pp | 128 +++++- puppet/manifests/overcloud_controller_pacemaker.pp | 482 ++++++++++++++------- puppet/manifests/overcloud_opendaylight.pp | 27 ++ puppet/opendaylight-puppet.yaml | 223 ++++++++++ puppet/vip-config.yaml | 1 + - 20 files changed, 1190 insertions(+), 162 deletions(-) + 20 files changed, 1188 insertions(+), 162 deletions(-) create mode 100644 environments/onos.yaml create mode 100644 environments/opendaylight-external.yaml create mode 100644 environments/opendaylight.yaml @@ -974,7 +974,7 @@ index cd41cc7..474d782 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..5114f80 100644 +index 1f6c2be..a3c0479 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -30,6 +30,21 @@ if hiera('step') >= 1 { @@ -1019,7 +1019,7 @@ index 1f6c2be..5114f80 100644 include ::neutron::agents::dhcp include ::neutron::agents::metadata -@@ -237,15 +253,103 @@ if hiera('step') >= 3 { +@@ -237,15 +253,101 @@ if hiera('step') >= 3 { require => Package['neutron'], } @@ -1030,10 +1030,8 @@ index 1f6c2be..5114f80 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 + } + } + @@ -1126,7 +1124,7 @@ index 1f6c2be..5114f80 100644 if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { include ::neutron::plugins::ml2::cisco::nexus1000v -@@ -280,8 +384,6 @@ if hiera('step') >= 3 { +@@ -280,8 +382,6 @@ if hiera('step') >= 3 { } Service['neutron-server'] -> Service['neutron-dhcp-service'] @@ -1135,7 +1133,7 @@ index 1f6c2be..5114f80 100644 Service['neutron-server'] -> Service['neutron-metadata'] include ::cinder -@@ -447,6 +549,20 @@ if hiera('step') >= 3 { +@@ -447,6 +547,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}" } |