From: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Date: Fri, 23 Dec 2016 20:12:20 +0000 (-0500)
Subject: Merge branch 'v1.0'
X-Git-Tag: v1.1.0~34
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=f8b1c530725ad1c0f49868575a567627c879c4af;hp=-c;p=osm%2FSO.git

Merge branch 'v1.0'
---

f8b1c530725ad1c0f49868575a567627c879c4af
diff --combined BUILD.sh
index 3735e5c7,996e7af1..18126ad0
--- a/BUILD.sh
+++ b/BUILD.sh
@@@ -114,10 -114,10 +114,10 @@@ f
  
  if [[ $PLATFORM == ub16 ]]; then
      PLATFORM_REPOSITORY=${1:-OSM}
 -    PLATFORM_VERSION=${2:-4.3.1.0.50309}
 +    PLATFORM_VERSION=${2:-4.3.1.0.53651}
  elif [[ $PLATFORM == fc20 ]]; then
      PLATFORM_REPOSITORY=${1:-OSM}  # change to OSM when published
 -    PLATFORM_VERSION=${2:-4.3.1.0.50310}
 +    PLATFORM_VERSION=${2:-4.3.1.0.53651}
  else
      echo "Internal error: unknown platform $PLATFORM"
      exit 1
@@@ -155,7 -155,7 +155,7 @@@ if [[ $PLATFORM == ub16 ]]; the
          
      # and install the tools
      sudo apt remove -y rw.toolchain-rwbase tcpdump
-     sudo apt-get install -y rw.tools-container-tools=${PLATFORM_VERSION} rw.tools-scripts=${PLATFORM_VERSION} python 
+     sudo apt-get install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSION} rw.tools-scripts=${PLATFORM_VERSION} python 
  elif [[ $PLATFORM == fc20 ]]; then
      # get the container tools from the correct repository
      sudo rm -f /etc/yum.repos.d/private.repo
@@@ -188,8 -188,6 +188,8 @@@ if [[ $PLATFORM == ub16 ]]; the
  	 rw.core.rwvx-rwdts=${PLATFORM_VERSION} \
  	 rw.automation.core-RWAUTO=${PLATFORM_VERSION} \
           rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION}
 +
 +    sudo apt-get install python-cinderclient
      
      sudo chmod 777 /usr/rift /usr/rift/usr/share