diff --git a/config/samples/infrastructure_v1alpha1_rabbitmq.yaml b/config/samples/infrastructure_v1alpha1_rabbitmq.yaml
index 4b54a8cf..e6a13d37 100644
--- a/config/samples/infrastructure_v1alpha1_rabbitmq.yaml
+++ b/config/samples/infrastructure_v1alpha1_rabbitmq.yaml
@@ -9,7 +9,7 @@ apiVersion: v1
 metadata:
   name: rabbitmq-sample
   namespace: default
-data:
-  password: Y0dGemMzZHZjbVE9
-  username: ZFhObGNnPT0=
+stringData:
+  username: stackrabbit
+  password: secretrabbit
 kind: Secret
diff --git a/playbooks/functional/devstack.yaml b/playbooks/functional/devstack.yaml
index 90ef45b6..73063f38 100644
--- a/playbooks/functional/devstack.yaml
+++ b/playbooks/functional/devstack.yaml
@@ -3,6 +3,9 @@
     - name: Get Memcached IP address
       command: kubectl get svc/mcrouter-memcached-sample -o=jsonpath='{.spec.clusterIP}'
       register: _memcached_ip
+    - name: Get RabbitMQ IP address
+      command: kubectl get svc/rabbitmq-sample -o=jsonpath='{.spec.clusterIP}'
+      register: _rabbitmq_ip
     # NOTE(mnaser): We need to rewrite the devstack local.conf because it happens
     #               inside pre.yaml right now.  This should all be gone once the
     #               operator can deploy OpenStack entirely by itself.
@@ -28,7 +31,9 @@
       set_fact:
         _devstack_localrc: "{{ devstack_localrc }}"
         _devstack_localrc_extra:
+          CELLSV2_SETUP: singleconductor
           MEMCACHE_SERVERS: "{{ _memcached_ip.stdout }}:11211"
+          RABBIT_HOST: "{{ _rabbitmq_ip.stdout }}"
     - name: Re-write local.conf
       include_role:
         name: write-devstack-local-conf
@@ -53,4 +58,4 @@
     - setup-tempest-run-dir
     - setup-tempest-data-dir
     - acl-devstack-files
-    - run-tempest
\ No newline at end of file
+    - run-tempest
diff --git a/zuul.d/functional-jobs.yaml b/zuul.d/functional-jobs.yaml
index 0fa235a8..010adcca 100644
--- a/zuul.d/functional-jobs.yaml
+++ b/zuul.d/functional-jobs.yaml
@@ -9,6 +9,7 @@
     vars:
       devstack_services:
         etcd3: false
+        rabbit: false
       docker_use_buildset_registry: true
       minikube_dns_resolvers: [1.1.1.1, 8.8.8.8]