diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index 8404be4..6adac4a 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -40,7 +40,7 @@
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.galera.server.database.designate
-- system.keepalived.cluster.instance.stacklight_control_vip
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.sl-os-contrail
 parameters:
   _param:
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index d6a9752..f1bc2a0 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -28,7 +28,7 @@
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.haproxy.proxy.listen.openstack.nova-placement
-- system.keepalived.cluster.instance.stacklight_control_vip
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.sl-os-ovs
 parameters:
   _param:
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster/sl-pike-dvr/openstack/control.yml
index e7f531e..fa09daf 100644
--- a/classes/cluster/sl-pike-dvr/openstack/control.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/control.yml
@@ -37,7 +37,7 @@
 - system.galera.server.database.nova
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
-- system.keepalived.cluster.instance.stacklight_control_vip
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.sl-pike-dvr
 
 parameters:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index e5f0e64..922bcf4 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -44,6 +44,7 @@
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
 - cluster.virtual-mcp-pike-dvr-ceph-rgw.infra
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
index d0a95c8..bd910d0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
@@ -41,6 +41,7 @@
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.virtual-mcp-pike-ovs-ceph.infra
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index 0726fd1..b5a4177 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -42,7 +42,7 @@
 - system.galera.server.database.nova
 - system.galera.server.database.designate
 - system.heka.alarm.openstack_control
-- system.keepalived.cluster.instance.stacklight_control_vip
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.virtual-mcp11-contrail-nfv
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 15b8093..36536bd 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -40,7 +40,7 @@
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.galera.server.database.designate
-- system.keepalived.cluster.instance.stacklight_control_vip
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.virtual-mcp11-contrail
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index efd9d9f..7f1abcf 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -33,7 +33,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- system.keepalived.cluster.instance.stacklight_control_vip
+- system.keepalived.cluster.instance.default_keepalived_check
 - cluster.virtual-mcp11-dvr
 
 parameters:
diff --git a/classes/system b/classes/system
index 8b772e1..4ea68a3 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 8b772e123bb9cddf93e8290ca2601bda2fcd6ed9
+Subproject commit 4ea68a31a721de6e95d717a49a8f4855d142e436