summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Yozhikov <iyozhikov@mirantis.com>2014-05-20 20:22:00 +0400
committerIgor Yozhikov <iyozhikov@mirantis.com>2014-05-20 20:24:46 +0400
commit8c0ce97101766d559f3e90ffeb63dde3fd40912b (patch)
tree6332ae5ff1e5ea28a2c41e9f85360a9d5d27c664
parent60205a1e4c2307739bddd6d9c7b810ec67a35f5f (diff)
Code updaterelease-0.5
* Add ubuntu 14.04 handling and icehouse repos * Updated dpkg apt params * Disabled exit on pip 1.5 detection Change-Id: I80b2c584e27407d172ad9dfeb4b405099fba9d34
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Timur Nurlygayanov <tnurlygayanov@mirantis.com> Code-Review+2: Dmitry Teselkin <dteselkin@mirantis.com> Workflow+1: Dmitry Teselkin <dteselkin@mirantis.com> Code-Review+1: Sergey Kolekonov <skolekonov@mirantis.com> Verified+1: murano-ci Code-Review+2: Timur Sufiev <tsufiev@mirantis.com> Submitted-by: Jenkins Submitted-at: Tue, 27 May 2014 12:48:43 +0000 Reviewed-on: https://review.openstack.org/94421 Project: stackforge/murano-dashboard Branch: refs/heads/release-0.5
-rw-r--r--common.inc6
-rw-r--r--setup.sh19
2 files changed, 14 insertions, 11 deletions
diff --git a/common.inc b/common.inc
index 48c2445..ca01f19 100644
--- a/common.inc
+++ b/common.inc
@@ -90,7 +90,7 @@ function find_or_install()
90 case $(lowercase $DISTRO_BASED_ON) in 90 case $(lowercase $DISTRO_BASED_ON) in
91 "debian") 91 "debian")
92 _pkg_mrg_cmd="$PKG_MGR -s $_searching_for" 92 _pkg_mrg_cmd="$PKG_MGR -s $_searching_for"
93 _pkgr_cmd="$PACKAGER install $_searching_for --yes -o Dpkg::Options::=\"--force-confnew\"" 93 _pkgr_cmd="$PACKAGER install $_searching_for --yes -o Dpkg::Options::=--force-confnew"
94 ;; 94 ;;
95 *) 95 *)
96 _pkg_mrg_cmd="$PKG_MGR -q $_searching_for" 96 _pkg_mrg_cmd="$PKG_MGR -q $_searching_for"
@@ -203,8 +203,8 @@ function find_pip()
203 _pip_ver=$($_cmd --version | grep -oE "[0-9]\.[0-9]" | head -n1) 203 _pip_ver=$($_cmd --version | grep -oE "[0-9]\.[0-9]" | head -n1)
204 version_ge $_pip_ver "1.5" 204 version_ge $_pip_ver "1.5"
205 if [ $? -eq 0 ]; then 205 if [ $? -eq 0 ]; then
206 log "For future use, sorry, use pip v$pip_min_ver, exiting!" 206 log "For future use, experimental, use pip v$pip_min_ver!"
207 exit 1 207 #exit 1
208 ##_pipargs="--allow-unverified --allow-external" 208 ##_pipargs="--allow-unverified --allow-external"
209 #_pipargs="--allow-all-external" 209 #_pipargs="--allow-all-external"
210 #mk_dir "/root/.pip" 210 #mk_dir "/root/.pip"
diff --git a/setup.sh b/setup.sh
index ab9cf86..7d86d18 100644
--- a/setup.sh
+++ b/setup.sh
@@ -54,15 +54,18 @@ function install_prerequisites()
54 fi 54 fi
55 find /var/lib/apt/lists/ -name "*cloud.archive*" | grep -q "icehouse_main" 55 find /var/lib/apt/lists/ -name "*cloud.archive*" | grep -q "icehouse_main"
56 if [ $? -ne 0 ]; then 56 if [ $? -ne 0 ]; then
57 add-apt-repository -y cloud-archive:icehouse >> $LOGFILE 2>&1 57 # Ubuntu 14.04 already has icehouse repos.
58 if [ $? -ne 0 ]; then 58 if [ $REV != "14.04" ]; then
59 log "... can't enable \"cloud-archive:havana\", exiting !" 59 add-apt-repository -y cloud-archive:icehouse >> $LOGFILE 2>&1
60 retval=1 60 if [ $? -ne 0 ]; then
61 return $retval 61 log "... can't enable \"cloud-archive:havana\", exiting !"
62 retval=1
63 return $retval
64 fi
65 apt-get update -y
66 apt-get upgrade -y -o Dpkg::Options::="--force-confnew"
67 log "..success"
62 fi 68 fi
63 apt-get update -y
64 apt-get upgrade -y -o Dpkg::Options::="--force-confnew"
65 log "..success"
66 fi 69 fi
67 ;; 70 ;;
68 "redhat") 71 "redhat")