diff options
author | 2017-03-30 23:03:43 -0400 | |
---|---|---|
committer | 2017-05-09 15:09:42 -0400 | |
commit | ac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 (patch) | |
tree | ed0c27aa4853848b0e47e3ce3de25dfb23bfc8df /build/patches/puppet-neutron-add-odl-settings.patch | |
parent | ef3dc1ce0323fa0881e416cd4b9028fb4250b719 (diff) |
Updating Apex to OpenStack Ocata
- power management updated to virtualbmc, pxe_ssh is deprecated
- removing custom tacker build
- removing custom congress build
- disabling yum update in undercloud on the cli instead of in a patch
- Undercloud is direct kernel booted now, there are no kernel and initrd
in the disk image from upstream
- remove OpenDaylight previous to Carbon
JIRA: APEX-433
JIRA: APEX-432
JIRA: APEX-431
Change-Id: I6963f16e65eacade5607a3082b58b6150331406c
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/patches/puppet-neutron-add-odl-settings.patch')
-rw-r--r-- | build/patches/puppet-neutron-add-odl-settings.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/build/patches/puppet-neutron-add-odl-settings.patch b/build/patches/puppet-neutron-add-odl-settings.patch deleted file mode 100644 index aa0b35a1..00000000 --- a/build/patches/puppet-neutron-add-odl-settings.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp -index a27c4d6..13b56c4 100644 ---- a/manifests/plugins/ml2/opendaylight.pp -+++ b/manifests/plugins/ml2/opendaylight.pp -@@ -29,12 +29,22 @@ - # (optional) The URI used to connect to the local OVSDB server - # Defaults to 'tcp:127.0.0.1:6639' - # -+# [*port_binding_controller*] -+# (optional) Name of the controller to be used for port binding. -+# Defaults to $::os_service_default -+# -+# [*odl_hostconf_uri*] -+# (optional) Path for ODL host configuration REST interface. -+# Defaults to $::os_service_default -+# - class neutron::plugins::ml2::opendaylight ( -- $package_ensure = 'present', -- $odl_username = $::os_service_default, -- $odl_password = $::os_service_default, -- $odl_url = $::os_service_default, -- $ovsdb_connection = 'tcp:127.0.0.1:6639', -+ $package_ensure = 'present', -+ $odl_username = $::os_service_default, -+ $odl_password = $::os_service_default, -+ $odl_url = $::os_service_default, -+ $ovsdb_connection = 'tcp:127.0.0.1:6639', -+ $port_binding_controller = $::os_service_default, -+ $odl_hostconf_uri = $::os_service_default, - ) { - - include ::neutron::deps -@@ -48,9 +58,11 @@ class neutron::plugins::ml2::opendaylight ( - ) - - neutron_plugin_ml2 { -- 'ml2_odl/username': value => $odl_username; -- 'ml2_odl/password': value => $odl_password; -- 'ml2_odl/url': value => $odl_url; -+ 'ml2_odl/username': value => $odl_username; -+ 'ml2_odl/password': value => $odl_password; -+ 'ml2_odl/url': value => $odl_url; -+ 'ml2_odl/port_binding_controller': value => $port_binding_controller; -+ 'ml2_odl/odl_hostconf_uri': value => $odl_hostconf_uri; - } - - neutron_config { |