Deprecate quota parameters for nova-network

... because nova-network was alreday removed.

Change-Id: I813fde4df06aa70d7d5b60f8b6d7105f3301c762

manifests/quota.pp

@@ -16,14 +16,6 @@
 #   (optional) Ram in MB
 #   Defaults to 51200
 #
-# [*floating_ips*]
-#   (optional) Number of floating IPs
-#   Defaults to 10
-#
-# [*fixed_ips*]
-#   (optional) Number of fixed IPs (this should be at least the number of instances allowed)
-#   Defaults to -1
-#
 # [*metadata_items*]
 #   (optional) Number of metadata items per instance
 #   Defaults to 128
@@ -40,14 +32,6 @@
 #   (optional) Maximum size in bytes of injected file path
 #   Defaults to 255
 #
-# [*security_groups*]
-#   (optional) Number of security groups
-#   Defaults to 10
-#
-# [*security_group_rules*]
-#   (optional) Number of security group rules
-#   Defaults to 20
-#
 # [*key_pairs*]
 #   (optional) Number of key pairs
 #   Defaults to 100
@@ -74,18 +58,30 @@
 #   (optional) Number of seconds between subsequent usage refreshes
 #   Defaults to undef
 #
+# [*floating_ips*]
+#   (optional) Number of floating IPs
+#   Defaults to undef
+#
+# [*fixed_ips*]
+#   (optional) Number of fixed IPs (this should be at least the number of instances allowed)
+#   Defaults to undef
+#
+# [*security_groups*]
+#   (optional) Number of security groups
+#   Defaults to undef
+#
+# [*security_group_rules*]
+#   (optional) Number of security group rules
+#   Defaults to undef
+#
 class nova::quota(
   $instances                         = 10,
   $cores                             = 20,
   $ram                               = 51200,
-  $floating_ips                      = 10,
-  $fixed_ips                         = -1,
   $metadata_items                    = 128,
   $injected_files                    = 5,
   $injected_file_content_bytes       = 10240,
   $injected_file_path_length         = 255,
-  $security_groups                   = 10,
-  $security_group_rules              = 20,
   $key_pairs                         = 100,
   $server_groups                     = 10,
   $server_group_members              = 10,
@@ -93,6 +89,10 @@ class nova::quota(
   $reservation_expire                = undef,
   $until_refresh                     = undef,
   $max_age                           = undef,
+  $floating_ips                      = undef,
+  $fixed_ips                         = undef,
+  $security_groups                   = undef,
+  $security_group_rules              = undef,
 ) {
 
   include nova::deps
@@ -101,6 +101,10 @@ class nova::quota(
     'reservation_expire',
     'until_refresh',
     'max_age',
+    'floating_ips',
+    'fixed_ips',
+    'security_groups',
+    'security_group_rules',
   ].each |String $removed_opt| {
     if getvar("${removed_opt}") != undef {
       warning("The ${removed_opt} parameter is deprecated and has no effect")
@@ -111,22 +115,22 @@ class nova::quota(
     'quota/instances':                   value => $instances;
     'quota/cores':                       value => $cores;
     'quota/ram':                         value => $ram;
-    'quota/floating_ips':                value => $floating_ips;
-    'quota/fixed_ips':                   value => $fixed_ips;
     'quota/metadata_items':              value => $metadata_items;
     'quota/injected_files':              value => $injected_files;
     'quota/injected_file_content_bytes': value => $injected_file_content_bytes;
     'quota/injected_file_path_length':   value => $injected_file_path_length;
-    'quota/security_groups':             value => $security_groups;
-    'quota/security_group_rules':        value => $security_group_rules;
     'quota/key_pairs':                   value => $key_pairs;
     'quota/server_groups':               value => $server_groups;
     'quota/server_group_members':        value => $server_group_members;
   }
 
   nova_config {
-    'quota/reservation_expire': ensure => absent;
+    'quota/reservation_expire':   ensure => absent;
-    'quota/until_refresh':      ensure => absent;
+    'quota/until_refresh':        ensure => absent;
-    'quota/max_age':            ensure => absent;
+    'quota/max_age':              ensure => absent;
+    'quota/floating_ips':         ensure => absent;
+    'quota/fixed_ips':            ensure => absent;
+    'quota/security_groups':      ensure => absent;
+    'quota/security_group_rules': ensure => absent;
   }
 }

releasenotes/notes/deprecate-nova-network-quota-opts-dbdb1fc2e454ed83.yaml

@@ -0,0 +1,11 @@
+---
+deprecations:
+  - |
+    The following parameters of the ``nova::quota`` class have been deprecated
+    and now have no effect. These parameters will be removed in a future
+    release.
+
+    - ``floating_ips``
+    - ``fixed_ips``
+    - ``security_groups``
+    - ``security_group_rules``

spec/classes/nova_quota_spec.rb

@@ -10,14 +10,10 @@ describe 'nova::quota' do
       :instances                   => 10,
       :cores                       => 20,
       :ram                         => 51200,
-      :floating_ips                => 10,
-      :fixed_ips                   => -1,
       :metadata_items              => 128,
       :injected_files              => 5,
       :injected_file_content_bytes => 10240,
       :injected_file_path_length   => 255,
-      :security_groups             => 10,
-      :security_group_rules        => 20,
       :key_pairs                   => 100,
       :server_groups               => 10,
       :server_group_members        => 10,
@@ -47,14 +43,10 @@ describe 'nova::quota' do
           :instances                   => 20,
           :cores                       => 40,
           :ram                         => 102400,
-          :floating_ips                => 20,
-          :fixed_ips                   => 512,
           :metadata_items              => 256,
           :injected_files              => 10,
           :injected_file_content_bytes => 20480,
           :injected_file_path_length   => 254,
-          :security_groups             => 20,
-          :security_group_rules        => 40,
           :key_pairs                   => 200,
           :server_groups               => 20,
           :server_group_members        => 20,