From 035ecbaa3e6b556694da95664c327204affe21f8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 8 Jul 2024 12:45:39 +0900 Subject: [PATCH] Fix wrong option to define provider segmentation id Fix the regression introduced by migration from neutron CLI to openstack CLI. Closes-Bug: #2072332 Change-Id: Id719358010f6400c010f5aaca834d0a5ed46b871 --- lib/puppet/provider/neutron_network/openstack.rb | 2 +- spec/unit/provider/neutron_network/openstack_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/neutron_network/openstack.rb b/lib/puppet/provider/neutron_network/openstack.rb index 6de01482e..511ce4457 100644 --- a/lib/puppet/provider/neutron_network/openstack.rb +++ b/lib/puppet/provider/neutron_network/openstack.rb @@ -97,7 +97,7 @@ Puppet::Type.type(:neutron_network).provide( if @resource[:provider_segmentation_id] opts << \ - "--provider-segmentation-id=#{@resource[:provider_segmentation_id]}" + "--provider-segment=#{@resource[:provider_segmentation_id]}" end if @resource[:router_external] == 'True' diff --git a/spec/unit/provider/neutron_network/openstack_spec.rb b/spec/unit/provider/neutron_network/openstack_spec.rb index f1a88ab09..b08835e4e 100644 --- a/spec/unit/provider/neutron_network/openstack_spec.rb +++ b/spec/unit/provider/neutron_network/openstack_spec.rb @@ -153,7 +153,7 @@ mtu="1500"') .with('network', 'create', '--format', 'shell', ['net1', '--provider-network-type=vlan', '--provider-physical-network=datacentre', - '--provider-segmentation-id=10']) + '--provider-segment=10']) .and_return('admin_state_up="True" availability_zone_hints="[]" id="076520cc-b783-4cf5-a4a9-4cb5a5e93a9b"