diff --git a/salt/minion/cert/mysql/clients/openstack/aodh.yml b/salt/minion/cert/mysql/clients/openstack/aodh.yml
index ba5ef52..ee1dccc 100644
--- a/salt/minion/cert/mysql/clients/openstack/aodh.yml
+++ b/salt/minion/cert/mysql/clients/openstack/aodh.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-aodh-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-aodh-client
diff --git a/salt/minion/cert/mysql/clients/openstack/barbican.yml b/salt/minion/cert/mysql/clients/openstack/barbican.yml
index 8d158ee..c6476d3 100644
--- a/salt/minion/cert/mysql/clients/openstack/barbican.yml
+++ b/salt/minion/cert/mysql/clients/openstack/barbican.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-barbican-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-barbican-client
diff --git a/salt/minion/cert/mysql/clients/openstack/cinder.yml b/salt/minion/cert/mysql/clients/openstack/cinder.yml
index 1ff053f..475132a 100644
--- a/salt/minion/cert/mysql/clients/openstack/cinder.yml
+++ b/salt/minion/cert/mysql/clients/openstack/cinder.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-cinder-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-cinder-client
diff --git a/salt/minion/cert/mysql/clients/openstack/designate.yml b/salt/minion/cert/mysql/clients/openstack/designate.yml
index f66c59f..7910dfb 100644
--- a/salt/minion/cert/mysql/clients/openstack/designate.yml
+++ b/salt/minion/cert/mysql/clients/openstack/designate.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-designate-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-designate-client
diff --git a/salt/minion/cert/mysql/clients/openstack/glance.yml b/salt/minion/cert/mysql/clients/openstack/glance.yml
index ab71174..436ac64 100644
--- a/salt/minion/cert/mysql/clients/openstack/glance.yml
+++ b/salt/minion/cert/mysql/clients/openstack/glance.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-glance-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-glance-client
diff --git a/salt/minion/cert/mysql/clients/openstack/gnocchi.yml b/salt/minion/cert/mysql/clients/openstack/gnocchi.yml
index 1aa31c9..f6f7497 100644
--- a/salt/minion/cert/mysql/clients/openstack/gnocchi.yml
+++ b/salt/minion/cert/mysql/clients/openstack/gnocchi.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-gnocchi-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-gnocchi-client
diff --git a/salt/minion/cert/mysql/clients/openstack/heat.yml b/salt/minion/cert/mysql/clients/openstack/heat.yml
index 1246dae..f338de7 100644
--- a/salt/minion/cert/mysql/clients/openstack/heat.yml
+++ b/salt/minion/cert/mysql/clients/openstack/heat.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-heat-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-heat-client
diff --git a/salt/minion/cert/mysql/clients/openstack/ironic.yml b/salt/minion/cert/mysql/clients/openstack/ironic.yml
index fe4aa19..d43dc86 100644
--- a/salt/minion/cert/mysql/clients/openstack/ironic.yml
+++ b/salt/minion/cert/mysql/clients/openstack/ironic.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-ironic-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-ironic-client
diff --git a/salt/minion/cert/mysql/clients/openstack/keystone.yml b/salt/minion/cert/mysql/clients/openstack/keystone.yml
index c0fe71d..69b100b 100644
--- a/salt/minion/cert/mysql/clients/openstack/keystone.yml
+++ b/salt/minion/cert/mysql/clients/openstack/keystone.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-keystone-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-keystone-client
diff --git a/salt/minion/cert/mysql/clients/openstack/manila.yml b/salt/minion/cert/mysql/clients/openstack/manila.yml
index a1ca797..700c3cb 100644
--- a/salt/minion/cert/mysql/clients/openstack/manila.yml
+++ b/salt/minion/cert/mysql/clients/openstack/manila.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-manila-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-manila-client
diff --git a/salt/minion/cert/mysql/clients/openstack/neutron.yml b/salt/minion/cert/mysql/clients/openstack/neutron.yml
index d5b1cd8..8bca247 100644
--- a/salt/minion/cert/mysql/clients/openstack/neutron.yml
+++ b/salt/minion/cert/mysql/clients/openstack/neutron.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-neutron-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-neutron-client
diff --git a/salt/minion/cert/mysql/clients/openstack/nova.yml b/salt/minion/cert/mysql/clients/openstack/nova.yml
index 4f03628..7aa67d6 100644
--- a/salt/minion/cert/mysql/clients/openstack/nova.yml
+++ b/salt/minion/cert/mysql/clients/openstack/nova.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-nova-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-nova-client
diff --git a/salt/minion/cert/mysql/clients/openstack/panko.yml b/salt/minion/cert/mysql/clients/openstack/panko.yml
index 0593ae2..ea7c450 100644
--- a/salt/minion/cert/mysql/clients/openstack/panko.yml
+++ b/salt/minion/cert/mysql/clients/openstack/panko.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         mysql-panko-client:
+          enabled: ${_param:openstack_mysql_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: mysql-panko-client