diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-11-13 16:10:36 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-11-16 14:51:16 -0500 |
| commit | b66bc18349140b0a3e34fac207819c57c25a1cbb (patch) | |
| tree | 6d63e597faf292c21e9dca4f4d93cd02ea299573 /build/patches/puppet-neutron-ml2-ip-version-fix.patch | |
| parent | e1c2217d0310a3fec511f34b36e8391aa83eac01 (diff) | |
Migrates Apex to Pike
JIRA: APEX-544
Change-Id: Ibee2068e782da75268ed76beb36ccb5dcd1847d6
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/patches/puppet-neutron-ml2-ip-version-fix.patch')
| -rw-r--r-- | build/patches/puppet-neutron-ml2-ip-version-fix.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/build/patches/puppet-neutron-ml2-ip-version-fix.patch b/build/patches/puppet-neutron-ml2-ip-version-fix.patch deleted file mode 100644 index 3cbb3a8c..00000000 --- a/build/patches/puppet-neutron-ml2-ip-version-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e3e4a9cf57d5d7da6914b31527188eff7e290238 Mon Sep 17 00:00:00 2001 -From: Feng Pan <fpan@redhat.com> -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 <fpan@redhat.com> ---- - -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') - } - |