diff --git a/salt/minion/cert/rabbitmq/clients/openstack/aodh.yml b/salt/minion/cert/rabbitmq/clients/openstack/aodh.yml
index 537a3a4..4f56674 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/aodh.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/aodh.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-aodh-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-aodh-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml b/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
index 9fa04ef..11c8b22 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-barbican-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-barbican-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/ceilometer.yml b/salt/minion/cert/rabbitmq/clients/openstack/ceilometer.yml
index a2b91fd..315e9f0 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/ceilometer.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/ceilometer.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-ceilometer-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-ceilometer-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/cinder.yml b/salt/minion/cert/rabbitmq/clients/openstack/cinder.yml
index 576c135..9129ca8 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/cinder.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/cinder.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-cinder-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-cinder-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/designate.yml b/salt/minion/cert/rabbitmq/clients/openstack/designate.yml
index f5eb631..973215f 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/designate.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/designate.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-designate-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-designate-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/glance.yml b/salt/minion/cert/rabbitmq/clients/openstack/glance.yml
index 94749ae..e4ad7d4 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/glance.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/glance.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-glance-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-glance-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/heat.yml b/salt/minion/cert/rabbitmq/clients/openstack/heat.yml
index e69ab14..f95f7d2 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/heat.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/heat.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-heat-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-heat-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/ironic.yml b/salt/minion/cert/rabbitmq/clients/openstack/ironic.yml
index f9b0d74..007faf2 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/ironic.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/ironic.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-ironic-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-ironic-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml b/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml
index 8261f73..4226118 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/keystone.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-keystone-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-keystone-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/manila.yml b/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
index 345b697..787273c 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-manila-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-manila-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/neutron.yml b/salt/minion/cert/rabbitmq/clients/openstack/neutron.yml
index 2f8f5c3..955506f 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/neutron.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/neutron.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-neutron-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-neutron-client
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/nova.yml b/salt/minion/cert/rabbitmq/clients/openstack/nova.yml
index 160acd9..dfacb00 100644
--- a/salt/minion/cert/rabbitmq/clients/openstack/nova.yml
+++ b/salt/minion/cert/rabbitmq/clients/openstack/nova.yml
@@ -9,6 +9,7 @@
     minion:
       cert:
         rabbitmq-nova-client:
+          enabled: ${_param:openstack_rabbitmq_x509_enabled}
           host: ${_param:salt_minion_ca_host}
           authority: ${_param:salt_minion_ca_authority}
           common_name: rabbitmq-nova-client