components/ruby/puppet-modules/openstack-neutron/patches/06-launchpad-1476680.patch
--- a/components/ruby/puppet-modules/openstack-neutron/patches/06-launchpad-1476680.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-Upstream patch to address
-https://bugs.launchpad.net/puppet-openstack/+bug/1476680
-
-This is fixed in 7.0.0 or newer releases of this module.
-
-
-From f4a0f2aa66bd04a930b02e2c2b3f9f0377a451e7 Mon Sep 17 00:00:00 2001
-From: Sergey Kolekonov <[email protected]>
-Date: Tue, 21 Jul 2015 19:17:20 +0300
-Subject: [PATCH] Fix 'shared' parameter check in neutron_network provider
-
-Use stricter check for 'shared' parameter
-
-Change-Id: I36149b42943238dc342f8c6e71c1261f00e01c4a
-Closes-bug: #1476680
-
---- openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb.orig 2016-04-21 08:24:23.864059475 -0700
-+++ openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb 2016-04-21 08:25:01.467129260 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require File.join(File.dirname(__FILE__), '..','..','..',
- 'puppet/provider/neutron')
-
-@@ -53,7 +57,7 @@
- def create
- network_opts = Array.new
-
-- if @resource[:shared]
-+ if @resource[:shared] =~ /true/i
- network_opts << '--shared'
- end
-
---- openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb.orig 2016-04-21 08:24:29.372659168 -0700
-+++ openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb 2016-04-21 08:25:06.247381103 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require 'puppet'
- require 'spec_helper'
- require 'puppet/provider/neutron_network/neutron'
-@@ -31,7 +35,33 @@
-
- shared_examples 'neutron_network' do
-
-- describe 'when creating a network' do
-+ describe 'when creating a non-shared network' do
-+
-+ it 'should call net-create with appropriate command line options' do
-+ provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
-+
-+ output = 'Created a new network:
-+admin_state_up="True"
-+id="d9ac3494-20ea-406c-a4ba-145923dfadc9"
-+name="net1"
-+shared="False"
-+status="ACTIVE"
-+subnets=""
-+tenant_id="60f9544eb94c42a6b7e8e98c2be981b1"'
-+
-+ provider.expects(:auth_neutron).with('net-create',
-+ '--format=shell', ["--tenant_id=#{net_attrs[:tenant_id]}"],
-+ net_name).returns(output)
-+
-+ provider.create
-+ end
-+ end
-+
-+ describe 'when creating a shared network' do
-+
-+ let :local_attrs do
-+ attrs = net_attrs.merge({:shared => 'True'})
-+ end
-
- it 'should call net-create with appropriate command line options' do
- provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])