diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 49606bbf98..39f61b9936 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 7d7fae118c..c755840b0f 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 4ca2476da7..788f3a681c 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 2c61b591e4..0a7d07fc92 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 888226a24d..a6f80cdacc 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 f0443c2a90..42223f676a 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 9b11381c72..a6f70ffa12 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 0f2891a7fc..2d725cc344 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 73ebfa34a9..c9b4e99146 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 18eb044166..ad7685a7cb 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 a89568c558..075125c692 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