From 8c796f4f1c25ae2fd045ba54cc3e92abde6e9b85 Mon Sep 17 00:00:00 2001 From: Keigo Noha Date: Tue, 11 May 2021 10:42:43 +0900 Subject: [PATCH] Add OVNCMSOptions to Controller and Networker roles OVN is a default networking service for Neutron. The default configurations for OVN were implemented but OVNCMSOptions was missing. This change introduces OVNCMSOptions to Controller and Networker roles. Closes-Bug: #1928901 Change-Id: I441f16f5e596dcbc6f5e567b07d3cd19a57c21e2 (cherry picked from commit 866645db1d558542ddda7c00409d39e9d0a0a1bd) (cherry picked from commit e15bfa6d8ddbaa9ad9608c28f8150134fe3f48d2) --- roles/Controller.yaml | 2 ++ roles/ControllerAllNovaStandalone.yaml | 2 ++ roles/ControllerNoCeph.yaml | 2 ++ roles/ControllerNovaStandalone.yaml | 2 ++ roles/ControllerOpenstack.yaml | 2 ++ roles/ControllerSriov.yaml | 2 ++ roles/ControllerStorageDashboard.yaml | 2 ++ roles/ControllerStorageNfs.yaml | 2 ++ roles/Networker.yaml | 2 ++ roles/NetworkerSriov.yaml | 2 ++ roles_data.yaml | 2 ++ 11 files changed, 22 insertions(+) diff --git a/roles/Controller.yaml b/roles/Controller.yaml index a5086299d7..d7816b0247 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -27,6 +27,8 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" # Deprecated & backward-compatible values (FIXME: Make parameters consistent) # Set uses_deprecated_params to True if any deprecated params are used. uses_deprecated_params: True diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index c102cee10b..546905a824 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -22,6 +22,8 @@ subnet: tenant_subnet default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" update_serial: 1 ServicesDefault: - OS::TripleO::Services::AodhApi diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 356812b4b5..30f2c064dc 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -22,6 +22,8 @@ subnet: tenant_subnet default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-no-ceph-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" # Deprecated & backward-compatible values (FIXME: Make parameters consistent) # Set uses_deprecated_params to True if any deprecated params are used. uses_deprecated_params: True diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index ab96f99351..4ef5859524 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -21,6 +21,8 @@ subnet: tenant_subnet default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" update_serial: 1 ServicesDefault: - OS::TripleO::Services::AodhApi diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index b3da633445..c61bdcfc24 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -22,6 +22,8 @@ subnet: tenant_subnet default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index de92363dc7..3e0f6a4067 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -24,6 +24,8 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-sriov-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" # Deprecated & backward-compatible values (FIXME: Make parameters consistent) # Set uses_deprecated_params to True if any deprecated params are used. uses_deprecated_params: True diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 41474139be..510522eec7 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -26,6 +26,8 @@ Tenant: subnet: tenant_subnet HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" # Deprecated & backward-compatible values (FIXME: Make parameters consistent) # Set uses_deprecated_params to True if any deprecated params are used. uses_deprecated_params: True diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index ead85d99dc..e638ba8893 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -26,6 +26,8 @@ Tenant: subnet: tenant_subnet HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" # Deprecated & backward-compatible values (FIXME: Make parameters consistent) # Set uses_deprecated_params to True if any deprecated params are used. uses_deprecated_params: True diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 35791c807e..7912d4dbff 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -12,6 +12,8 @@ tags: - external_bridge HostnameFormatDefault: '%stackname%-networker-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide diff --git a/roles/NetworkerSriov.yaml b/roles/NetworkerSriov.yaml index c496d0a2ed..85ee989da6 100644 --- a/roles/NetworkerSriov.yaml +++ b/roles/NetworkerSriov.yaml @@ -12,6 +12,8 @@ tags: - external_bridge HostnameFormatDefault: '%stackname%-networker-sriov-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide diff --git a/roles_data.yaml b/roles_data.yaml index ae68469036..5d0d2cb46e 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -30,6 +30,8 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + RoleParametersDefault: + OVNCMSOptions: "enable-chassis-as-gw" # Deprecated & backward-compatible values (FIXME: Make parameters consistent) # Set uses_deprecated_params to True if any deprecated params are used. uses_deprecated_params: True