From e8a53f56f21d3da28a2a82138d6c91a919dd353b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 3 Jan 2019 19:54:15 +0100 Subject: [PATCH] Remove networks from Undercloud and Standalone roles Change https://review.openstack.org/614457 added these networks because of the defaults in ServiceNetMap. With changes related to LP Bug #1809313 these are no longer required, as the ServiceNetMap fall's back to ctlplane when networks are not defined or disabled in networks data. Related-Bug: #1809313 Depends-On: I102912851a3b9952daaf7c4d5a34a919f527f805 Change-Id: Ic4f22692f93db4ce0db0f4fbc83eca6b492b28e7 --- roles/Standalone.yaml | 11 ----------- roles/Undercloud.yaml | 8 -------- roles_data_undercloud.yaml | 8 -------- 3 files changed, 27 deletions(-) diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index dcf3030532..e8d9773335 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -12,17 +12,6 @@ - primary - controller - standalone - networks: - External: - subnet: external_subnet - InternalApi: - subnet: internal_api_subnet - Storage: - subnet: storage_subnet - StorageMgmt: - subnet: storage_mgmt_subnet - Tenant: - subnet: tenant_subnet disable_constraints: True ServicesDefault: - OS::TripleO::Services::Aide diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 06eb8423b1..f9521b5d98 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -13,14 +13,6 @@ networks: External: subnet: external_subnet - InternalApi: - subnet: internal_api_subnet - Storage: - subnet: storage_subnet - StorageMgmt: - subnet: storage_mgmt_subnet - Tenant: - subnet: tenant_subnet ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AodhApi diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index d8a4dd81d4..dad946f70c 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -16,14 +16,6 @@ networks: External: subnet: external_subnet - InternalApi: - subnet: internal_api_subnet - Storage: - subnet: storage_subnet - StorageMgmt: - subnet: storage_mgmt_subnet - Tenant: - subnet: tenant_subnet ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AodhApi