From c33040b161f78f9d750c28cd097c6de5e900c5bc Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Sun, 1 Oct 2017 22:29:14 -0400 Subject: Fix bugs in the installation process - Add short-term fix to robot script after MSO/SO renaming - Change docker version number in SDNC Change-Id: I625e09457b843c875ea19c69ed6078f88a978f17 Issue-ID: INT-213 Signed-off-by: Marco Platania --- boot/robot_install.sh | 3 +++ heat/ONAP/onap_openstack.env | 2 +- heat/ONAP/onap_openstack_float.env | 2 +- heat/ONAP/onap_openstack_nofloat.env | 2 +- heat/ONAP/onap_rackspace.env | 2 +- 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 -- cgit 1.2.3-korg