Merge "Add OVNCMSOptions to Controller and Networker roles" into stable/victoria

2021-06-08 20:48:13 +00:00 · 2021-06-08 20:48:13 +00:00 · 8c9e9d8964
commit 8c9e9d8964
parent 496accc442 8c796f4f1c
11 changed files with 22 additions and 0 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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