From b3028e63ee268051e513bbd315051a954afd936e Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Thu, 16 May 2019 10:51:27 -0400 Subject: [PATCH] Change to use non-deprecated security group rule syntax --src-ip and --src-group were deprecated in 2016, change to use --remote-ip and --remote-group, respectively. Related to https://review.opendev.org/#/c/659400/ Change-Id: Ie609380b130410e3548eeacffd72871c6b5722ea --- lib/puppet/provider/nova_security_rule/openstack.rb | 6 +++--- spec/unit/provider/nova_security_rule/openstack_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/puppet/provider/nova_security_rule/openstack.rb b/lib/puppet/provider/nova_security_rule/openstack.rb index 70747f7db..efb507f06 100644 --- a/lib/puppet/provider/nova_security_rule/openstack.rb +++ b/lib/puppet/provider/nova_security_rule/openstack.rb @@ -24,9 +24,9 @@ Puppet::Type.type(:nova_security_rule).provide( end unless @resource[:ip_range].nil? - opts << "--src-ip" << @resource[:ip_range] + opts << "--remote-ip" << @resource[:ip_range] else - opts << "--src-group" << @resource[:source_group] + opts << "--remote-group" << @resource[:source_group] end @property_hash = self.class.nova_request('security group rule', 'create', nil, opts) @@ -119,4 +119,4 @@ Puppet::Type.type(:nova_security_rule).provide( resources[name].provider = rule if rule end end -end \ No newline at end of file +end diff --git a/spec/unit/provider/nova_security_rule/openstack_spec.rb b/spec/unit/provider/nova_security_rule/openstack_spec.rb index 1d3c78353..3d813aa61 100644 --- a/spec/unit/provider/nova_security_rule/openstack_spec.rb +++ b/spec/unit/provider/nova_security_rule/openstack_spec.rb @@ -37,7 +37,7 @@ describe provider_class do describe "#create" do it 'should create security group rule' do provider.class.stubs(:openstack) - .with('security group rule', 'create', ['scg0', '--protocol', 'tcp', '--dst-port', '22:23', '--src-ip', '0.0.0.0/0']) + .with('security group rule', 'create', ['scg0', '--protocol', 'tcp', '--dst-port', '22:23', '--remote-ip', '0.0.0.0/0']) .returns('id="021114fb-67e0-4882-b2ed-e7c5328d8aa8" protocol="tcp" port_range_max="22"