update default dha file and iso path

JIRA: COMPASS-313

Change-Id: I3e3c8016917513a2a8a963f2f007cb6faa4a1c7e
Signed-off-by: baigk <baiguoku@huawei.com>
(cherry picked from commit 33e9c3c7780a663ead5e0133b11de15332b62835)

diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 0c221e9..540efec 100644 (file)
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -1,4 +1,4 @@
-export ISO_URL=${ISO_URL:-http://58.251.166.184:9999/compass.iso}
+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}
 export INSTALL_GW=${INSTALL_GW:-10.1.0.1}

diff --git a/deploy/config_parse.py b/deploy/config_parse.py
index 172388c..63269f3 100644 (file)
--- a/deploy/config_parse.py
+++ b/deploy/config_parse.py
@@ -34,7 +34,7 @@ def hostroles(s, seq, host=None):
 def hostmacs(s, seq, host=None):
     return host.get('mac', '')
 
-def export_config_file(s, conf_dir, ofile):
+def export_config_file(s, config_file, conf_dir, ofile):
     env = {}
     env.update(s)
     if env.get('hosts', []):
@@ -47,6 +47,7 @@ def export_config_file(s, conf_dir, ofile):
     env.update({'FLAVOR': s.get('FLAVOR', "cluster")})
     env.update({'HOSTNAMES': hostnames(s, ',')})
     env.update({'HOST_ROLES': hostroles(s, ';')})
+    env.update({'DHA': config_file})
 
     value = hostmacs(s, ',')
     if len(value) > 0:
@@ -82,7 +83,7 @@ if __name__ == "__main__":
 
     data = init(config_file)
 
-    export_config_file(data, conf_dir, os.path.join(output_dir, output_file))
+    export_config_file(data, config_file, conf_dir, os.path.join(output_dir, output_file))
     export_reset_file(data, tmpl_dir, output_dir, os.path.join(output_dir, output_file))
 
     sys.exit(0)

diff --git a/deploy/deploy_parameter.sh b/deploy/deploy_parameter.sh
index c370ba5..d8696ce 100755 (executable)
--- a/deploy/deploy_parameter.sh
+++ b/deploy/deploy_parameter.sh
@@ -42,9 +42,7 @@ function get_conf_name()
     done
 
     if [[ $# -eq 0 ]]; then
-        export DHA="$COMPASS_DIR/deploy/conf/virtual_cluster.yml"
-    elif [[ "$1" == "five" ]];then
-        export DHA="$COMPASS_DIR/deploy/conf/virtual_five.yml"
+        export DHA="$COMPASS_DIR/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml"
     else
         file=${1%*.yml}.yml
         if [[ -f $file ]]; then