Move default DHA/NETWORK/NEUTRON from scripts to config file

JIRA:COMPASS-343
  - the default config should be visible to end-user

Change-Id: I0471e9b51c9a08e32553ebbae0556576c9ec2ab2
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>

diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 540efec..f009a4a 100644 (file)
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -1,3 +1,6 @@
+export DHA=${DHA:-$COMPASS_DIR/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml}
+export NEUTRON=${NEUTRON:-$COMPASS_DIR/deploy/conf/neutron_cfg.yaml}
+export NETWORK=${NETWORK:-$COMPASS_DIR/deploy/conf/network_cfg.yaml}
 export ISO_URL=${ISO_URL:-file://`pwd`/work/building/compass.iso}
 export INSTALL_IP=${INSTALL_IP:-10.1.0.12}
 export INSTALL_MASK=${INSTALL_MASK:-255.255.255.0}

diff --git a/deploy/config_parse.py b/deploy/config_parse.py
index 63269f3..21fe76d 100644 (file)
--- a/deploy/config_parse.py
+++ b/deploy/config_parse.py
@@ -40,9 +40,6 @@ def export_config_file(s, config_file, conf_dir, ofile):
     if env.get('hosts', []):
         env.pop('hosts')
 
-    env.update({'NEUTRON': os.path.join(conf_dir, "neutron_cfg.yaml")})
-    env.update({'NETWORK': os.path.join(conf_dir, "network_cfg.yaml")})
-
     env.update({'TYPE': s.get('TYPE', "virtual")})
     env.update({'FLAVOR': s.get('FLAVOR', "cluster")})
     env.update({'HOSTNAMES': hostnames(s, ',')})