From 2dd874a7f3595a233d958a9f990c488a0f58a21b Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Wed, 16 Jan 2019 15:56:03 +0530 Subject: [PATCH] Rename tempest_public_net_physical_{type to name} tempest_public_net_physical_type var stores the physical network name but due to the name of the var it looks confusing. This patch renames the var and providing that user can still use tempest_public_net_physical_type var. Change-Id: I45f63426a105ada0715c665a1289ed6d09911202 --- defaults/main.yml | 5 ++++- ...te-tempest-public-net-physical-type-88d7946e6fe0d53c.yaml | 5 +++++ tasks/tempest_resources.yml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/releasenotes/notes/deprecate-tempest-public-net-physical-type-88d7946e6fe0d53c.yaml diff --git a/defaults/main.yml b/defaults/main.yml index f5330e57..3279de35 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -145,7 +145,10 @@ tempest_public_subnet_cidr: "10.1.13.0/24" # Neutron default gateway to first ip of subnet, usually .1 # tempest_public_subnet_gateway_ip: tempest_public_net_provider_type: "flat" -tempest_public_net_physical_type: "flat" +# TODO(chkumar246): +# The use of _type is to provide backwards compatibility for +# overrides in S and can be removed in T. +tempest_public_net_physical_name: "{{ tempest_public_net_physical_type | default('flat') }}" tempest_public_net_seg_id: "" tempest_public_router_external: "True" # Example allocation range: diff --git a/releasenotes/notes/releasenotes/notes/deprecate-tempest-public-net-physical-type-88d7946e6fe0d53c.yaml b/releasenotes/notes/releasenotes/notes/deprecate-tempest-public-net-physical-type-88d7946e6fe0d53c.yaml new file mode 100644 index 00000000..5d1688e1 --- /dev/null +++ b/releasenotes/notes/releasenotes/notes/deprecate-tempest-public-net-physical-type-88d7946e6fe0d53c.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - The variable ``tempest_public_net_physical_type`` will be + removed by Train release in the favor of + ``tempest_public_net_physical_name``. diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml index a2dbdcb5..44ec6689 100644 --- a/tasks/tempest_resources.yml +++ b/tasks/tempest_resources.yml @@ -170,7 +170,7 @@ validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}" name: "{{ tempest_public_net_name }}" provider_network_type: "{{ tempest_public_net_provider_type }}" - provider_physical_network: "{{ tempest_public_net_physical_type | default(omit) }}" + provider_physical_network: "{{ tempest_public_net_physical_name | default(omit) }}" provider_segmentation_id: "{{ tempest_public_net_seg_id | default(omit) }}" external: "{{ tempest_public_router_external }}" project: "{{ keystone_demo_tenant_id }}"