cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: updated refs/heads/master to 34b7288
Date Mon, 03 Nov 2014 06:46:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master efc9632c1 -> 34b7288ca


CLOUDSTACK-7748: Cloudstack version number is missing in system vm template. /etc/cloudstack-release
in system vm does not have version number which leads in vm deployment failure while checking
router version.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34b7288c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34b7288c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34b7288c

Branch: refs/heads/master
Commit: 34b7288ca424faa4b9d33b4f678dc7403e354099
Parents: efc9632
Author: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Authored: Fri Oct 17 16:58:04 2014 +0530
Committer: Kishan Kavala <kishan@apache.org>
Committed: Mon Nov 3 12:13:04 2014 +0530

----------------------------------------------------------------------
 tools/appliance/build.sh                                           | 2 ++
 .../definitions/systemvmtemplate/configure_systemvm_services.sh    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34b7288c/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 8bf78b1..4ff99b8 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -250,8 +250,10 @@ function create_definition() {
   if [ "${appliance}" != "${appliance_build_name}" ]; then
     cp -r "definitions/${appliance}" "definitions/${appliance_build_name}"
     set +e
+    if [ ! -z "${version}" ]; then
     sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/"
\
         "definitions/${appliance_build_name}/configure_systemvm_services.sh"
+    fi
     if [ ! -z "${ssh_key}" ]; then
       # ssh key lines can contain /
       sed ${sed_regex_option} -i -e "s|^key=.+|key=\"${ssh_key}\"|" \

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34b7288c/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
index c076bb5..013a8f6 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
+++ b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
@@ -19,7 +19,7 @@
 set -e
 set -x
 
-CLOUDSTACK_RELEASE=4.4.0
+CLOUDSTACK_RELEASE=4.5.0
 
 function configure_apache2() {
    # Enable ssl, rewrite and auth


Mime
View raw message