From: Tim Rozet <trozet@redhat.com>
Date: Thu, 26 May 2016 15:44:52 +0000 (-0400)
Subject: Fixes deploy lib in spec and bug with return codes
X-Git-Tag: colorado.1.0~222
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F14735%2F1;p=apex.git

Fixes deploy lib in spec and bug with return codes

Change-Id: If646ce606f96d0bcd6681ada193d60e6b59f93ff
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 2b49e18c..6915b795 100644
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -50,6 +50,7 @@ mkdir -p %{buildroot}%{python3_sitelib}/apex/
 install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/
 install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/
 install lib/python/apex/net_env.py %{buildroot}%{python3_sitelib}/apex/
+install lib/python/apex/deploy_env.py %{buildroot}%{python3_sitelib}/apex/
 mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
 install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
 
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 677d4484..b5208272 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -106,7 +106,8 @@ parse_setting_value() {
 
 ##parses network settings yaml into globals
 parse_network_settings() {
-  if local output=$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py parse_net_settings -n $NETSETS -i $net_isolation_enabled); then
+  local output
+  if output=$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py parse_net_settings -n $NETSETS -i $net_isolation_enabled); then
       echo -e "${blue}${output}${reset}"
       eval "$output"
   else
@@ -117,7 +118,8 @@ parse_network_settings() {
 
 ##parses deploy settings yaml into globals
 parse_deploy_settings() {
-  if local output=$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py parse-deploy-settings -f $DEPLOY_SETTINGS_FILE); then
+  local output
+  if output=$(python3.4 -B $CONFIG/lib/python/apex-python-utils.py parse-deploy-settings -f $DEPLOY_SETTINGS_FILE); then
       echo -e "${blue}${output}${reset}"
       eval "$output"
   else