diff --git a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/nfvi.pp b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/nfvi.pp
index c99ccae43f..1ba070ff0d 100644
--- a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/nfvi.pp
+++ b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/nfvi.pp
@@ -22,6 +22,7 @@ class nfv::nfvi (
   $ceilometer_service_name       = 'ceilometer',
   $ceilometer_service_type       = 'metering',
   $ceilometer_endpoint_type      = 'admin',
+  $ceilometer_endpoint_disabled  = false,
   $cinder_region_name            = 'RegionOne',
   $cinder_service_name           = 'cinderv2',
   $cinder_service_type           = 'volumev2',
@@ -31,6 +32,7 @@ class nfv::nfvi (
   $glance_service_name           = 'glance',
   $glance_service_type           = 'image',
   $glance_endpoint_type          = 'admin',
+  $glance_endpoint_disabled      = false,
   $neutron_region_name           = 'RegionOne',
   $neutron_service_name          = 'neutron',
   $neutron_service_type          = 'network',
@@ -41,6 +43,7 @@ class nfv::nfvi (
   $nova_service_type             = 'compute',
   $nova_endpoint_type            = 'admin',
   $nova_endpoint_override        = "http://localhost:18774",
+  $nova_endpoint_disabled        = false,
   $sysinv_region_name            = 'RegionOne',
   $sysinv_service_name           = 'sysinv',
   $sysinv_service_type           = 'platform',
@@ -97,6 +100,7 @@ class nfv::nfvi (
     'ceilometer/service_name': value => $ceilometer_service_name;
     'ceilometer/service_type': value => $ceilometer_service_type;
     'ceilometer/endpoint_type': value => $ceilometer_endpoint_type;
+    'ceilometer/endpoint_disabled': value => $ceilometer_endpoint_disabled;
 
     'cinder/region_name': value => $cinder_region_name;
     'cinder/service_name': value => $cinder_service_name;
@@ -108,6 +112,7 @@ class nfv::nfvi (
     'glance/service_name': value => $glance_service_name;
     'glance/service_type': value => $glance_service_type;
     'glance/endpoint_type': value => $glance_endpoint_type;
+    'glance/endpoint_disabled': value => $glance_endpoint_disabled;
 
     'neutron/region_name': value => $neutron_region_name;
     'neutron/service_name': value => $neutron_service_name;
@@ -120,6 +125,7 @@ class nfv::nfvi (
     'nova/service_type': value => $nova_service_type;
     'nova/endpoint_type': value => $nova_endpoint_type;
     'nova/endpoint_override': value => $nova_endpoint_override;
+    'nova/endpoint_disabled': value => $nova_endpoint_disabled;
 
     'sysinv/region_name': value => $sysinv_region_name;
     'sysinv/service_name': value => $sysinv_service_name;
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
index a1dc7c2980..ccf3388449 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
@@ -33,7 +33,7 @@ class NfvPuppet(openstack.OpenstackBasePuppet):
             single_hypervisor = False
             single_controller = False
 
-        return {
+        config = {
             'nfv::keystone::auth::public_url': self.get_public_url(),
             'nfv::keystone::auth::internal_url': self.get_internal_url(),
             'nfv::keystone::auth::admin_url': self.get_admin_url(),
@@ -103,6 +103,21 @@ class NfvPuppet(openstack.OpenstackBasePuppet):
                 self._to_create_services(),
         }
 
+        if self._kubernetes_enabled():
+            endpoints_disabled = {
+                # Disable VIM for these services as they will not yet be
+                # active.
+                'nfv::nfvi::cinder_endpoint_disabled': True,
+                'nfv::nfvi::nova_endpoint_disabled': True,
+                'nfv::nfvi::glance_endpoint_disabled': True,
+                'nfv::nfvi::neutron_endpoint_disabled': True,
+                'nfv::nfvi::ceilometer_endpoint_disabled': True
+            }
+
+            config.update(endpoints_disabled)
+
+        return config
+
     def get_host_config(self, host):
         if (constants.CONTROLLER not in utils.get_personalities(host)):
             return {}