diff options
9 files changed, 55 insertions, 9 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 277e37dcf..b16b5deae 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -41,8 +41,6 @@ function _write_heat_integrationtests { cat > $upgrade_tests <<EOF heat_tempest_plugin.tests.api heat_integrationtests.functional.test_autoscaling -heat_integrationtests.functional.test_cancel_update -heat_integrationtests.functional.test_create_update heat_integrationtests.functional.test_instance_group heat_integrationtests.functional.test_resource_group.ResourceGroupTest heat_integrationtests.functional.test_resource_group.ResourceGroupUpdatePolicyTest diff --git a/heat/engine/resources/openstack/neutron/lbaas/health_monitor.py b/heat/engine/resources/openstack/neutron/lbaas/health_monitor.py index da945aab1..f8ed35931 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/health_monitor.py +++ b/heat/engine/resources/openstack/neutron/lbaas/health_monitor.py @@ -29,7 +29,12 @@ class HealthMonitor(neutron.NeutronResource): which watches status of the load balanced servers. """ - support_status = support.SupportStatus(version='6.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='6.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/heat/engine/resources/openstack/neutron/lbaas/l7policy.py b/heat/engine/resources/openstack/neutron/lbaas/l7policy.py index 8a1233cf0..50cefef92 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/l7policy.py +++ b/heat/engine/resources/openstack/neutron/lbaas/l7policy.py @@ -35,7 +35,12 @@ class L7Policy(neutron.NeutronResource): listener.default_pool_id. """ - support_status = support.SupportStatus(version='7.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='7.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/heat/engine/resources/openstack/neutron/lbaas/l7rule.py b/heat/engine/resources/openstack/neutron/lbaas/l7rule.py index 28d0052e3..8e8d6105d 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/l7rule.py +++ b/heat/engine/resources/openstack/neutron/lbaas/l7rule.py @@ -27,7 +27,12 @@ class L7Rule(neutron.NeutronResource): be matched and how it should be matched. """ - support_status = support.SupportStatus(version='7.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='7.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/heat/engine/resources/openstack/neutron/lbaas/listener.py b/heat/engine/resources/openstack/neutron/lbaas/listener.py index 1e60679b9..682e04190 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/listener.py +++ b/heat/engine/resources/openstack/neutron/lbaas/listener.py @@ -31,7 +31,12 @@ class Listener(neutron.NeutronResource): which represent a listening endpoint for the vip. """ - support_status = support.SupportStatus(version='6.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='6.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/heat/engine/resources/openstack/neutron/lbaas/loadbalancer.py b/heat/engine/resources/openstack/neutron/lbaas/loadbalancer.py index 3b1cda94e..3cc231d6e 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/loadbalancer.py +++ b/heat/engine/resources/openstack/neutron/lbaas/loadbalancer.py @@ -33,7 +33,12 @@ class LoadBalancer(neutron.NeutronResource): which allows traffic to be directed between servers. """ - support_status = support.SupportStatus(version='6.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='6.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/heat/engine/resources/openstack/neutron/lbaas/pool.py b/heat/engine/resources/openstack/neutron/lbaas/pool.py index 63d2868a6..ccebd2694 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/pool.py +++ b/heat/engine/resources/openstack/neutron/lbaas/pool.py @@ -32,7 +32,12 @@ class Pool(neutron.NeutronResource): and the nodes themselves. """ - support_status = support.SupportStatus(version='6.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='6.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/heat/engine/resources/openstack/neutron/lbaas/pool_member.py b/heat/engine/resources/openstack/neutron/lbaas/pool_member.py index d14ea4092..04c817815 100644 --- a/heat/engine/resources/openstack/neutron/lbaas/pool_member.py +++ b/heat/engine/resources/openstack/neutron/lbaas/pool_member.py @@ -29,7 +29,12 @@ class PoolMember(neutron.NeutronResource): A pool member represents a single backend node. """ - support_status = support.SupportStatus(version='6.0.0') + support_status = support.SupportStatus( + status=support.HIDDEN, + version='21.0.0', + message=_('Use octavia instead.'), + previous_status=support.SupportStatus(version='6.0.0') + ) required_service_extension = 'lbaasv2' diff --git a/releasenotes/notes/lbaasv2-hidden-a8f82ddfdba911eb.yaml b/releasenotes/notes/lbaasv2-hidden-a8f82ddfdba911eb.yaml new file mode 100644 index 000000000..1d064a876 --- /dev/null +++ b/releasenotes/notes/lbaasv2-hidden-a8f82ddfdba911eb.yaml @@ -0,0 +1,13 @@ +--- +upgrade: + - | + The following resources types are now hidden. Neutron LBaaS v2 was already + retired thus these resource types can no longer be used. + + - ``OS::Neutron::LBaaS::LoadBalancer`` + - ``OS::Neutron::LBaaS::Listener`` + - ``OS::Neutron::LBaaS::Pool`` + - ``OS::Neutron::LBaaS::PoolMember`` + - ``OS::Neutron::LBaaS::HealthMonitor`` + - ``OS::Neutron::LBaaS::L7Policy`` + - ``OS::Neutron::LBaaS::L7Rule`` |