npd via helm

magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh

@@ -4,9 +4,12 @@ printf "Starting to run ${step}\n"
 . /etc/sysconfig/heat-params
 
 _gcr_prefix=${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}
+cern_chart_enabled=$(echo "${CERN_CHART_ENABLED}" | tr '[:upper:]' '[:lower:]')
 
+# Install NPD if the cern chart is not enabled (otherwise it will be installed via helm)
 # Either auto scaling or auto healing we need CA to be deployed
-if [[ "$(echo $AUTO_HEALING_ENABLED | tr '[:upper:]' '[:lower:]')" = "true" || "$(echo $NPD_ENABLED | tr '[:upper:]' '[:lower:]')" = "true" ]]; then
+if [[ "$(echo $AUTO_HEALING_ENABLED | tr '[:upper:]' '[:lower:]')" = "true" && "${cern_chart_enabled}" != "true" ||
+"$(echo $NPD_ENABLED | tr '[:upper:]' '[:lower:]')" = "true" && "${cern_chart_enabled}" != "true" ]]; then
     # Generate Node Problem Detector manifest file
     NPD_DEPLOY=/srv/magnum/kubernetes/manifests/npd.yaml