diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index b4add44..820c5ff 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -60,8 +60,9 @@
         host: ${_param:single_address}
         port: 9696
         mtu: 1500
+        tenant: service
       metadata:
-        password: metadataPass
+        password: ${_param:metadata_password}
       cache:
         engine: memcached
         members:
diff --git a/nova/controller.sls b/nova/controller.sls
index c212413..4bd7a9a 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -80,6 +80,9 @@
     {%- if controller.version == "ocata" %}
     - 'su -s /bin/sh -c "nova-manage cell_v2 map_cell0" nova'
     {%- endif %}
+    {%- if controller.version == "newton" or controller.version == "ocata" %}
+    - nova-manage db online_data_migrations
+    {%- endif %}
     - nova-manage db sync
   - require:
     - file: /etc/nova/nova.conf
diff --git a/nova/files/newton/nova-controller.conf.Debian b/nova/files/newton/nova-controller.conf.Debian
index 5f5fbe6..dee5e52 100644
--- a/nova/files/newton/nova-controller.conf.Debian
+++ b/nova/files/newton/nova-controller.conf.Debian
@@ -81,7 +81,7 @@
                          {%- endfor -%}
                              /{{ controller.message_queue.virtual_host }}
 {%- else %}
-transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}{{ controller.message_queue.virtual_host }}
+transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}/{{ controller.message_queue.virtual_host }}
 {%- endif %}
 
 rpc_backend=rabbit
diff --git a/nova/files/newton/nova-controller.conf.RedHat b/nova/files/newton/nova-controller.conf.RedHat
index c8382d7..6739f80 100644
--- a/nova/files/newton/nova-controller.conf.RedHat
+++ b/nova/files/newton/nova-controller.conf.RedHat
@@ -78,7 +78,7 @@
                          {%- endfor -%}
                              /{{ controller.message_queue.virtual_host }}
 {%- else %}
-transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}{{ controller.message_queue.virtual_host }}
+transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}/{{ controller.message_queue.virtual_host }}
 {%- endif %}
 
 rpc_backend=rabbit
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index 52f9a33..f838054 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -3042,7 +3042,7 @@
                          {%- endfor -%}
                              /{{ controller.message_queue.virtual_host }}
 {%- else %}
-transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}{{ controller.message_queue.virtual_host }}
+transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}/{{ controller.message_queue.virtual_host }}
 {%- endif %}
 
 # DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers