Deprecate NeutronSriovNumVFs and neutron-sriov-host-config

Deprecating the parameter NeutronSriovNumVFs and the service
neutron-sriov-host-config. The numvfs shall be configured
using the sriov_pf type in nic configs.

Depends-On: I2923e046727c901219be693f248b7c0078331b83
Change-Id: I977a69add983cfe59f2dd82f05ebf7e11a85c25e

deployment/deprecated/neutron/neutron-sriov-host-config.yaml

@@ -41,6 +41,16 @@ parameters:
     tags:
       - role_specific
 
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - NeutronSriovNumVFs
+
 resources:
 
   NeutronBase:

deployment/neutron/neutron-sriov-agent-container-puppet.yaml

@@ -80,6 +80,16 @@ parameters:
     tags:
       - role_specific
 
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - NeutronSriovNumVFs
+
 resources:
 
   # Merging role-specific parameters (RoleParameters) with the default parameters.
@@ -93,13 +103,11 @@ resources:
           - map_replace:
             - neutron::agents::ml2::sriov::physical_device_mappings: NeutronPhysicalDevMappings
               neutron::agents::ml2::sriov::exclude_devices: NeutronExcludeDevices
-              tripleo::host::sriov::number_of_vfs: NeutronSriovNumVFs
               neutron::agents::ml2::sriov::extensions: NeutronSriovAgentExtensions
             - values: {get_param: [RoleParameters]}
           - values:
               NeutronPhysicalDevMappings: {get_param: NeutronPhysicalDevMappings}
               NeutronExcludeDevices: {get_param: NeutronExcludeDevices}
-              NeutronSriovNumVFs: {get_param: NeutronSriovNumVFs}
               NeutronSriovAgentExtensions: {get_param: NeutronSriovAgentExtensions}
 
   ContainersCommon:

environments/services-baremetal/neutron-sriov.yaml

@@ -1,7 +1,7 @@
 # A Heat environment that can be used to enable SR-IOV support in neutron.
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/deprecated/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']

environments/services/neutron-opendaylight-sriov.yaml

@@ -4,7 +4,7 @@
 resource_registry:
   OS::TripleO::Services::ComputeNeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/deprecated/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']

environments/services/neutron-ovn-sriov.yaml

@@ -8,7 +8,7 @@
 
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/deprecated/neutron/neutron-sriov-host-config.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
 
 parameter_defaults:

environments/services/neutron-sriov.yaml

@@ -1,7 +1,7 @@
 # A Heat environment that can be used to enable SR-IOV support in neutron.
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/deprecated/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']

releasenotes/notes/deprecate-neutronsriovnumvfs-96c9de5c6f071aeb.yaml

@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    During upgrade/update the NeutronSriovNumVFs shall be avoided and instead
+    the sriov_pf object in nic-configs shall be used. The numvfs attribute of
+    sriov_pf type shall will lead to the equivalent configuration.
+deprecations:
+  - |
+    The NeutronSriovNumVFs is deprecated and any new or existing deployments
+    using this THT parameter shall perform the equivalent configuration
+    implemented using sriov_pf network object in nic configs.