From 987e3724654429c505937e711e9f7f56d811f665 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Fri, 21 Sep 2018 10:13:53 -0400 Subject: [PATCH] Disable VIM plugins for Kubernetes deployment Do not load vim plugins and disable vim audits instead of just disabling the endpoints as was previously done in Change 599741. Leave setting of (new) Nova and (pre-existing) Neutron endpoint disabled flags for infrastructure host services usage. Story: 2002876 Task: 26573 Change-Id: Id3af829562e5765b99dbab23d913d65a4e6ec4a7 Signed-off-by: Kevin Smith --- .../puppet-nfv/src/nfv/manifests/nfvi.pp | 4 ---- .../puppet-nfv/src/nfv/manifests/vim.pp | 10 ++++++++++ sysinv/sysinv/sysinv/sysinv/puppet/nfv.py | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-) 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 1ba070ff0d..53f1e91756 100644 --- a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/nfvi.pp +++ b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/nfvi.pp @@ -22,7 +22,6 @@ 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', @@ -32,7 +31,6 @@ 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', @@ -100,7 +98,6 @@ 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; @@ -112,7 +109,6 @@ 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; diff --git a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp index 519f7419a2..066b9f86f8 100644 --- a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp +++ b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp @@ -20,6 +20,11 @@ class nfv::vim ( $event_log_config_file ='/etc/nfv/nfv_plugins/event_log_handlers/config.ini', $nfvi_namespace = 'nfv_vim.nfvi.plugins.v1', $nfvi_config_file = '/etc/nfv/nfv_plugins/nfvi_plugins/config.ini', + $image_plugin_disabled = false, + $block_storage_plugin_disabled = false, + $compute_plugin_disabled = false, + $network_plugin_disabled = false, + $guest_plugin_disabled = false, $vim_rpc_ip = '127.0.0.1', $vim_rpc_port = 4343, $vim_api_ip = '0.0.0.0', @@ -60,6 +65,11 @@ class nfv::vim ( /* NFVI */ 'nfvi/namespace': value => $nfvi_namespace; 'nfvi/config_file': value => $nfvi_config_file; + 'nfvi/image_plugin_disabled': value => $image_plugin_disabled; + 'nfvi/block_storage_plugin_disabled': value => $block_storage_plugin_disabled; + 'nfvi/compute_plugin_disabled': value => $compute_plugin_disabled; + 'nfvi/network_plugin_disabled': value => $network_plugin_disabled; + 'nfvi/guest_plugin_disabled': value => $guest_plugin_disabled; /* INSTANCE CONFIGURATION */ 'instance-configuration/max_live_migrate_wait_in_secs': value => $instance_max_live_migrate_wait_in_secs; diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py index ccf3388449..7055248af0 100644 --- a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py +++ b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py @@ -104,17 +104,19 @@ class NfvPuppet(openstack.OpenstackBasePuppet): } if self._kubernetes_enabled(): - endpoints_disabled = { - # Disable VIM for these services as they will not yet be - # active. - 'nfv::nfvi::cinder_endpoint_disabled': True, + vim_disabled = { + # Disable VIM plugins for resources not yet + # (and which may never be) active. + 'nfv::vim::block_storage_plugin_disabled': True, + 'nfv::vim::compute_plugin_disabled': True, + 'nfv::vim::network_plugin_disabled': True, + 'nfv::vim::image_plugin_disabled': True, + 'nfv::vim::guest_plugin_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 + 'nfv::nfvi::neutron_endpoint_disabled': True } - config.update(endpoints_disabled) + config.update(vim_disabled) return config