aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot/robot_install.sh3
-rw-r--r--heat/ONAP/onap_openstack.env2
-rw-r--r--heat/ONAP/onap_openstack_float.env2
-rw-r--r--heat/ONAP/onap_openstack_nofloat.env2
-rw-r--r--heat/ONAP/onap_rackspace.env2
5 files changed, 7 insertions, 4 deletions
diff --git a/boot/robot_install.sh b/boot/robot_install.sh
index 3447a01f..70cf4b14 100644
--- a/boot/robot_install.sh
+++ b/boot/robot_install.sh
@@ -9,6 +9,9 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
CODE_REPO=$(cat /opt/config/remote_repo.txt)
+# Short-term fix to get around MSO to SO name change
+cp /opt/config/so_ip_addr.txt /opt/config/mso_ip_addr.txt
+
# Add host name to /etc/host to avoid warnings in openstack images
if [[ $CLOUD_ENV != "rackspace" ]]
then
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 97f01922..3576ef7f 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -154,7 +154,7 @@ parameters:
portal_docker: 1.3-STAGING-latest
robot_docker: 1.1-STAGING-latest
sdc_docker: 1.1-STAGING-latest
- sdnc_docker: 1.2-SNAPSHOT-latest
+ sdnc_docker: 1.2-STAGING-latest
vid_docker: 1.1-STAGING-latest
clamp_docker: 1.1-STAGING-latest
msb_docker: latest
diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env
index e75aafb5..0a3e8e61 100644
--- a/heat/ONAP/onap_openstack_float.env
+++ b/heat/ONAP/onap_openstack_float.env
@@ -175,7 +175,7 @@ parameters:
portal_docker: 1.3-STAGING-latest
robot_docker: 1.1-STAGING-latest
sdc_docker: 1.1-STAGING-latest
- sdnc_docker: 1.2-SNAPSHOT-latest
+ sdnc_docker: 1.2-STAGING-latest
vid_docker: 1.1-STAGING-latest
clamp_docker: 1.1-STAGING-latest
msb_docker: latest
diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env
index b8aa95df..aa206c96 100644
--- a/heat/ONAP/onap_openstack_nofloat.env
+++ b/heat/ONAP/onap_openstack_nofloat.env
@@ -147,7 +147,7 @@ parameters:
portal_docker: 1.3-STAGING-latest
robot_docker: 1.1-STAGING-latest
sdc_docker: 1.1-STAGING-latest
- sdnc_docker: 1.2-SNASPHOT-latest
+ sdnc_docker: 1.2-STAGING-latest
vid_docker: 1.1-STAGING-latest
clamp_docker: 1.1-STAGING-latest
msb_docker: latest
diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env
index 72b19443..ad5ffae1 100644
--- a/heat/ONAP/onap_rackspace.env
+++ b/heat/ONAP/onap_rackspace.env
@@ -99,7 +99,7 @@ parameters:
portal_docker: 1.3-STAGING-latest
robot_docker: 1.1-STAGING-latest
sdc_docker: 1.1-STAGING-latest
- sdnc_docker: 1.2-SNAPSHOT-latest
+ sdnc_docker: 1.2-STAGING-latest
vid_docker: 1.1-STAGING-latest
clamp_docker: 1.1-STAGING-latest
dgbuilder_docker: 0.1-STAGING-latest