diff --git a/metadata/service/compute/container.yml b/metadata/service/compute/container.yml
new file mode 100644
index 0000000..145ebcc
--- /dev/null
+++ b/metadata/service/compute/container.yml
@@ -0,0 +1,53 @@
+parameters:
+  kubernetes:
+    control:
+      configmap:
+        nova-compute:
+          grains:
+            os_family: Debian
+          pillar:
+            nova:
+              compute:
+                version: ${_param:nova_version}
+                enabled: true
+                virtualization: kvm
+                vncproxy_url: http://${_param:nova_service_host}:6080
+                reserved_host_memory_mb: 32768
+                libvirt:
+                  uri: "qemu+tcp://localhost/system"
+                log_dir_perms: 755
+                bind:
+                  vnc_address: 0.0.0.0
+                  vnc_port: 6080
+                  vnc_name: 0.0.0.0
+                database:
+                  engine: mysql
+                  host: ${_param:cluster_vip_address}
+                  port: 3306
+                  name: nova
+                  user: nova
+                  password: ${_param:mysql_nova_password}
+                identity:
+                  engine: keystone
+                  host: ${_param:keystone_service_host}
+                  port: 35357
+                  user: nova
+                  password: ${_param:keystone_nova_password}
+                  tenant: service
+                message_queue:
+                  engine: rabbitmq
+                  host: ${_param:rabbitmq_service_host}
+                  user: openstack
+                  port: 5672
+                  password: ${_param:rabbitmq_openstack_password}
+                  virtual_host: '/openstack'
+                image:
+                  engine: glance
+                  host: ${_param:glance_service_host}
+                  port: 9292
+                network:
+                  engine: neutron
+                  user: neutron
+                  password: ${_param:keystone_neutron_password}
+                  host: ${_param:neutron_service_host}
+                  port: 9696
\ No newline at end of file
diff --git a/nova/files/mitaka/nova-compute.conf.Debian b/nova/files/mitaka/nova-compute.conf.Debian
index 6168d6e..368081e 100644
--- a/nova/files/mitaka/nova-compute.conf.Debian
+++ b/nova/files/mitaka/nova-compute.conf.Debian
@@ -35,7 +35,7 @@
 libvirt_nonblocking = True
 
 neutron_url_timeout = 300
-compute_driver = libvirt.LibvirtDriver
+compute_driver = nova.virt.libvirt.LibvirtDriver
 
 heal_instance_info_cache_interval = {{ compute.heal_instance_info_cache_interval }}
 
@@ -96,6 +96,10 @@
 virt_type = kvm
 use_virtio_for_bridges = True
 
+{%- if compute.get('libvirt', {}).uri is defined %}
+connection_uri={{ compute.libvirt.uri }}
+{%- endif %}
+
 [keystone_authtoken]
 signing_dirname=/tmp/keystone-signing-nova
 revocation_cache_time = 10
diff --git a/nova/files/mitaka/nova-controller.conf.Debian b/nova/files/mitaka/nova-controller.conf.Debian
index e38f50a..a01be60 100644
--- a/nova/files/mitaka/nova-controller.conf.Debian
+++ b/nova/files/mitaka/nova-controller.conf.Debian
@@ -28,7 +28,7 @@
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
 api_paste_config=/etc/nova/api-paste.ini
 
-compute_driver = libvirt.LibvirtDriver
+compute_driver = nova.virt.libvirt.LibvirtDriver
 rootwrap_config = /etc/nova/rootwrap.conf
 auth_strategy = keystone
 firewall_driver=nova.virt.firewall.NoopFirewallDriver
diff --git a/nova/map.jinja b/nova/map.jinja
index 43789ad..c7956f7 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -7,7 +7,7 @@
 
 {% set controller = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['nova-novncproxy', 'novnc', 'nova-api', 'nova-cert', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base'],
+        'pkgs': ['nova-consoleproxy', 'novnc', 'nova-api', 'nova-cert', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base'],
         'services': ['nova-api', 'nova-cert', 'nova-consoleauth', 'nova-scheduler', 'nova-conductor', 'nova-novncproxy'],
         'debug': false,
     },
@@ -56,3 +56,8 @@
         'libvirt_service': 'libvirt-bin',
     },
 }, grain='oscodename', merge=pillar.nova.get('compute', {}))) %}
+
+{%- if salt['pillar.get']('linux:system:repo:mirantis_openstack', False) %}
+{%- do compute.update({'libvirt_bin': '/etc/default/libvirtd'}) %}
+{%- do compute.update({'libvirt_service': 'libvirtd'}) %}
+{%- endif %}
\ No newline at end of file
diff --git a/nova/meta/sensu.yml b/nova/meta/sensu.yml
index 6c9114d..686a86e 100644
--- a/nova/meta/sensu.yml
+++ b/nova/meta/sensu.yml
@@ -57,7 +57,7 @@
     subscribers:
     - local-nova-compute
   remote_openstack_nova_instance:
-    command: "PATH=$PATH:/usr/local/bin oschecks-check_nova_instance --auth_url='http://:::openstack.host:::::::openstack.port:::/v2.0' --username :::openstack.user::: --password :::openstack.password::: --tenant :::openstack.tenant:::"
+    command: "PATH=$PATH:/usr/local/bin oschecks-check_nova_instance --auth_url='http://:::openstack.host:::::::openstack.port:::/v2.0' --username :::openstack.user::: --password :::openstack.password::: --tenant :::openstack.tenant::: --region_name {{ region }}"
     interval: 300
     occurrences: 1
     subscribers: