diff --git a/classes/cluster/sl-pike-dvr/infra/config.yml b/classes/cluster/sl-pike-dvr/infra/config.yml
index 98ef8d2..c5e0514 100644
--- a/classes/cluster/sl-pike-dvr/infra/config.yml
+++ b/classes/cluster/sl-pike-dvr/infra/config.yml
@@ -3,7 +3,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.openstack
-#- system.openssh.client.lab
+- system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
@@ -15,11 +15,8 @@
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
 - system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
 - system.mysql.client.single
-- system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
@@ -36,9 +33,9 @@
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
-    reclass_config_master: 192.168.10.90
+    reclass_config_master: ${_param:infra_config_deploy_address}
+    single_address: ${_param:infra_config_address}
     reclass_config_master_gateway: 192.168.10.1
-    single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
@@ -133,6 +130,16 @@
           cluster_param:
             openstack_gateway_node01_address:
               value_template: <<node_control_ip>>
+        openstack_compute:
+          expression: <<node_hostname>>__startswith__cmp
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.compute
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
         stacklight_monitor_node01:
           expression: <<node_hostname>>__equals__mon01
           cluster_param:
@@ -160,7 +167,7 @@
       node:
         openstack_control_node01:
           classes:
-          - cluster.virtual-mcp-pike-dvr.infra.backup.client_mysql
+          - cluster.sl-pike-dvr.infra.backup.client_mysql
           - service.galera.master.cluster
           params:
             mysql_cluster_role: master
@@ -173,7 +180,7 @@
             linux_system_codename: xenial
         openstack_control_node03:
           classes:
-          - cluster.virtual-mcp-pike-dvr.infra.backup.server
+          - cluster.sl-pike-dvr.infra.backup.server
           - service.galera.slave.cluster
           params:
             mysql_cluster_role: slave
@@ -184,12 +191,10 @@
           - system.influxdb.database.stacklight
         openstack_compute_node01:
           params:
-            single_address: 172.16.10.105
             tenant_address: 10.1.0.105
             external_address: 10.16.0.105
         openstack_compute_node02:
           params:
-            single_address: 172.16.10.106
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
         openstack_gateway_node01:
@@ -198,6 +203,6 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-pike-dvr.openstack.proxy
+          - cluster.sl-pike-dvr.openstack.proxy
           params:
             linux_system_codename: xenial
diff --git a/classes/cluster/sl-pike-dvr/infra/init.yml b/classes/cluster/sl-pike-dvr/infra/init.yml
index b01723d..4181446 100644
--- a/classes/cluster/sl-pike-dvr/infra/init.yml
+++ b/classes/cluster/sl-pike-dvr/infra/init.yml
@@ -1,4 +1,9 @@
 parameters:
+  _param:
+    cluster_domain: sl-pike-dvr.local
+    cluster_name: sl-pike-dvr
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.100
   linux:
     network:
       host:
@@ -12,3 +17,8 @@
           names:
           - cfg
           - cfg.${_param:cluster_domain}
+  openssh:
+    server:
+      alive:
+        interval: 86400
+        count: 500