From 29d4c7d5849d8690a3567e502b71336116f4e11b Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Wed, 19 Jul 2017 12:59:20 -0400 Subject: Add support for fdio scenarios Add support for the following scenarios: - os-odl-fdio-ha - os-odl-fdio-noha - os-nosdn-fdio-noha - os-nosdn-fdio-ha apex-tripleo-heat-templates: If11092e6581445a70e63c8f6c48518698b3cc8fc apex-puppet-tripleo: If498c41d706c8f14a5b0bbee64cb4d26cd78c2d0 apex-os-net-config: If7a2c6119bf613f1fc8846237b077cd8f0e26015 Change-Id: Id3fdd09f6e0d2b7666d08c0dc7802165797eefdc Signed-off-by: Feng Pan --- .../puppet-neutron-ml2-ip-version-fix.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 build/patches/puppet-neutron-ml2-ip-version-fix.patch (limited to 'build/patches/puppet-neutron-ml2-ip-version-fix.patch') diff --git a/build/patches/puppet-neutron-ml2-ip-version-fix.patch b/build/patches/puppet-neutron-ml2-ip-version-fix.patch new file mode 100644 index 00000000..3cbb3a8c --- /dev/null +++ b/build/patches/puppet-neutron-ml2-ip-version-fix.patch @@ -0,0 +1,28 @@ +From e3e4a9cf57d5d7da6914b31527188eff7e290238 Mon Sep 17 00:00:00 2001 +From: Feng Pan +Date: Wed, 17 May 2017 11:39:31 -0400 +Subject: [PATCH] Make sure overlay_ip_version is treated as string + +puppet throws error if overlay_ip_version is passed in through hiera +as an integer. We should make sure this variable is treated as string +for the 'in' operator. + +Closes-Bug: #1691502 + +Change-Id: I1c034e8018c959672b106e2d57992cf93b945d8a +Signed-off-by: Feng Pan +--- + +diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp +index d931e72..b943593 100644 +--- a/manifests/plugins/ml2.pp ++++ b/manifests/plugins/ml2.pp +@@ -171,7 +171,7 @@ + warning ('supported_pci_vendor_devs is deprecated, has no effect and will be removed in a future release.') + } + +- if !is_service_default($overlay_ip_version) and !($overlay_ip_version in [4, 6]) { ++ if !is_service_default($overlay_ip_version) and !("${overlay_ip_version}" in ['4', '6']) { + fail('Invalid IP version for overlay_ip_version') + } + -- cgit 1.2.3-korg