From 1c0a03c6d8e83eadce444cf6de6a4ec18d888ee4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 26 Apr 2021 21:46:56 +0900 Subject: [PATCH] Clean up floating ip pool management for nova-network ... because it was deprecated during the previous cycle and has been useless since nova-network was removed. Change-Id: If637debcd25b17183311e16e1bf5b76c453c634f --- .../provider/nova_floating/nova_manage.rb | 18 ------------------ lib/puppet/type/nova_floating.rb | 19 ------------------- manifests/deps.pp | 7 ------- manifests/manage/floating.pp | 15 --------------- ...remove-nova_floating-bc0c6ace911f9c51.yaml | 6 ++++++ 5 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 lib/puppet/provider/nova_floating/nova_manage.rb delete mode 100644 lib/puppet/type/nova_floating.rb delete mode 100644 manifests/manage/floating.pp create mode 100644 releasenotes/notes/remove-nova_floating-bc0c6ace911f9c51.yaml diff --git a/lib/puppet/provider/nova_floating/nova_manage.rb b/lib/puppet/provider/nova_floating/nova_manage.rb deleted file mode 100644 index 6ae9f3107..000000000 --- a/lib/puppet/provider/nova_floating/nova_manage.rb +++ /dev/null @@ -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 diff --git a/lib/puppet/type/nova_floating.rb b/lib/puppet/type/nova_floating.rb deleted file mode 100644 index 32fd3c165..000000000 --- a/lib/puppet/type/nova_floating.rb +++ /dev/null @@ -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 diff --git a/manifests/deps.pp b/manifests/deps.pp index 8a970c019..2ecd8662f 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -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'] diff --git a/manifests/manage/floating.pp b/manifests/manage/floating.pp deleted file mode 100644 index 705c8fd81..000000000 --- a/manifests/manage/floating.pp +++ /dev/null @@ -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') -} diff --git a/releasenotes/notes/remove-nova_floating-bc0c6ace911f9c51.yaml b/releasenotes/notes/remove-nova_floating-bc0c6ace911f9c51.yaml new file mode 100644 index 000000000..3cffd58ca --- /dev/null +++ b/releasenotes/notes/remove-nova_floating-bc0c6ace911f9c51.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The ``nova::manage::floatingip`` class, the ``nova_floating`` type and its + provider have been removed. +