From: Ricardo Noriega <rnoriega@redhat.com>
Date: Fri, 21 Dec 2018 22:32:54 +0000 (+0000)
Subject: Merge "Always update OVS to 2.9.2"
X-Git-Tag: opnfv-8.0.0~8
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cf3f62e9bac681bad8e81c568893077f122da619;hp=4f988328adf5dd8735bbf0a9420528cd343cfcd3;p=apex.git

Merge "Always update OVS to 2.9.2"
---

diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 39ddd6e8..27263740 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -99,6 +99,12 @@ DUPLICATE_COMPUTE_SERVICES = [
     'OS::TripleO::Services::ComputeNeutronL3Agent'
 ]
 
+NFS_VARS = [
+    'NovaNfsEnabled',
+    'GlanceNfsEnabled',
+    'CinderNfsEnabledBackend'
+]
+
 
 def build_sdn_env_list(ds, sdn_map, env_list=None):
     """
@@ -693,11 +699,11 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
     # Merge compute services into control services if only a single
     # node deployment
     if num_compute == 0:
-        logging.info("All in one deployment. Checking if service merging "
-                     "required into control services")
         with open(tmp_opnfv_env, 'r') as fh:
             data = yaml.safe_load(fh)
         param_data = data['parameter_defaults']
+        logging.info("All in one deployment detected")
+        logging.info("Disabling NFS in env file")
         # Check to see if any parameters are set for Compute
         for param in param_data.keys():
             if param != 'ComputeServices' and param.startswith('Compute'):
@@ -705,6 +711,10 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
                                 "in deployment: {}. Please use Controller "
                                 "based parameters when using All-in-one "
                                 "deployments".format(param))
+            if param in NFS_VARS:
+                param_data[param] = False
+        logging.info("Checking if service merging required into "
+                     "control services")
         if ('ControllerServices' in param_data and 'ComputeServices' in
                 param_data):
             logging.info("Services detected in environment file. Merging...")
@@ -719,11 +729,11 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
             logging.debug("Merged controller services: {}".format(
                 pprint.pformat(param_data['ControllerServices'])
             ))
-            with open(tmp_opnfv_env, 'w') as fh:
-                yaml.safe_dump(data, fh, default_flow_style=False)
         else:
             logging.info("No services detected in env file, not merging "
                          "services")
+        with open(tmp_opnfv_env, 'w') as fh:
+            yaml.safe_dump(data, fh, default_flow_style=False)
 
     logging.info("opnfv-environment file written to {}".format(tmp_opnfv_env))
     with open(tmp_opnfv_env, 'r') as fh: