openstack/puppet-nova
Code Issues Proposed changes

Merge "Clean up floating ip pool management for nova-network"

Browse Source
This commit is contained in:
Zuul 2021-04-27 12:11:00 +00:00 committed by Gerrit Code Review
commit 0367a5ceed
5 changed files with 6 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/puppet/provider/nova_floating/nova_manage.rb
View File

@ -1,18 +0,0 @@
Puppet::Type.type(:nova_floating).provide(:nova_manage) do
desc "Manage nova floating (DEPRECATED!)"
optional_commands :nova_manage => 'nova-manage'
def exists?
warning('nova_floating type is deprecated and has no effect')
end
def create
warning('nova_floating type is deprecated and has no effect')
end
def destroy
warning('nova_floating type is deprecated and has no effect')
end
end

19
lib/puppet/type/nova_floating.rb
View File

@ -1,19 +0,0 @@
Puppet::Type.newtype(:nova_floating) do
@doc = "Manage creation/deletion of nova floating ip ranges. (DEPRECATED!)"
ensurable
newparam(:network, :namevar => true) do
desc "It can contain network (ie, 192.168.1.0/24 or 192.168.1.128/25 etc.),
ip range ('192.168.1.1-192.168.1.55' or list of ip ranges ['192.168.1.1-192.168.1.25', '192.168.1.30-192.168.1.55'])"
newvalues(/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2}$ || ^(\d{1,3}\.){3}\d{1,3}-(\d{1,3}\.){3}\d{1,3}$/)
end
newparam(:pool) do
desc "Floating IP pool name. Default: 'nova'"
defaultto :nova
newvalues(/^.{1,255}$/)
end
end

7
manifests/deps.pp
View File

@ -48,13 +48,6 @@ class nova::deps {
-> Package<| tag == 'nova-support-package'|>
-> Anchor['nova::install::end']
# The following resources are managed by calling 'nova manage' and so the
# database must be provisioned before they can be applied.
Anchor['nova::dbsync_api::end']
-> Nova_floating<||>
Anchor['nova::dbsync::end']
-> Nova_floating<||>
# all cache settings should be applied and all packages should be installed
# before service startup
Oslo::Cache<||> -> Anchor['nova::service::begin']

15
manifests/manage/floating.pp
View File

@ -1,15 +0,0 @@
# Creates floating networks
#
# === Parameters:
#
# [*network*]
# (mandatory) The network name to work on
#
define nova::manage::floating (
$network
) {
include nova::deps
warning('The nova::manage::floating class is deprecated and has no effect')
}

6
releasenotes/notes/remove-nova_floating-bc0c6ace911f9c51.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The ``nova::manage::floatingip`` class, the ``nova_floating`` type and its
provider have been removed.