diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 8cec296855..101c8bd949 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 b0b88f2692..81a05c3e2b 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 8435a5e25a..cb71070587 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 ec9bd0abc5..b1cf14b498 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 eb676f413e..bdf4f58d69 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 2c064abf75..491f7ad488 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 66b79d167c..42d053723b 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 f46cb604d6..6ecb6b65c4 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 7703b75cab..0159332571 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 0ccaa5095a..fcb5c4667e 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 e7b358d6a9..3f4dc87b45 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