Merge "Add OVNCMSOptions to Controller and Networker roles"

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

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

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

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

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

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

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

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

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

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

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