diff --git a/params.pp b/params.pp
index bb1d1d2f..a0f50780 100644
--- a/params.pp
+++ b/params.pp
@@ -153,6 +153,7 @@ class os_params {
   $ks_nova_public_host = 'os-ci-test3.enovance.com'
   $ks_nova_public_port = '8774'
   $ks_nova_public_proto = 'http'
+  $neutron_metadata_proxy_shared_secret = 'k9i0t428P1AMxQ5X6a841psMJ'
 
   # Glance
   $glance_allowed_hosts = ['os-ci-test%', '10.60.0.%']
diff --git a/roles/compute/compute_controller.pp b/roles/compute/compute_controller.pp
index c2186fbc..2a4d26ec 100644
--- a/roles/compute/compute_controller.pp
+++ b/roles/compute/compute_controller.pp
@@ -19,7 +19,9 @@
 #
 
 class os_compute_controller(
-  $local_ip = $ipaddress_eth1,
+  $ks_keystone_internal_host            = $os_params::ks_keystone_internal_host,
+  $ks_nova_password                     = $os_params::ks_nova_password,
+  $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret,
 ){
 
   class { [
@@ -27,31 +29,16 @@ class os_compute_controller(
     'nova::cert',
     'nova::consoleauth',
     'nova::conductor',
+    'nova::spicehtml5proxy',
   ]:
     enabled => true,
   }
 
-  class spicehtml5proxy(
-    $enabled        = true,
-    $host           = '0.0.0.0',
-    $port           = '6082',
-  ) {
-    nova_config {
-      'DEFAULT/spicehtml5proxy_host': value => $host;
-      'DEFAULT/spicehtml5proxy_port': value => $port;
-    }
-    nova::generic_service { 'spicehtml5proxy':
-      enabled        => $true,
-      package_name   => 'nova-consoleproxy',
-      service_name   => 'nova-spicehtml5proxy',
-    }
-  }
-
   class { 'nova::api':
     enabled                              => true,
-    auth_host                            => $os_params::ks_keystone_internal_host,
-    admin_password                       => $os_params::ks_nova_password,
-    quantum_metadata_proxy_shared_secret => $os_params::quantum_metadata_proxy_shared_secret,
+    auth_host                            => $ks_keystone_internal_host,
+    admin_password                       => $ks_nova_password,
+    neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_shared_secret,
   }
 
 }