cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajeshbatt...@apache.org
Subject git commit: updated refs/heads/4.3 to ba73b29
Date Thu, 05 Dec 2013 06:30:21 GMT
Updated Branches:
  refs/heads/4.3 5d9ed55d9 -> ba73b2939


CLOUDSTACK-5312 added hyperv support in seeding the systemvm template script


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

Branch: refs/heads/4.3
Commit: ba73b2939a22fd7528970ce865dc9862dc25cae2
Parents: 5d9ed55
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Thu Dec 5 11:59:59 2013 +0530
Committer: Rajesh Battala <rajesh.battala@citrix.com>
Committed: Thu Dec 5 12:05:25 2013 +0530

----------------------------------------------------------------------
 scripts/storage/secondary/cloud-install-sys-tmplt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba73b293/scripts/storage/secondary/cloud-install-sys-tmplt
----------------------------------------------------------------------
diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt
index 2e822f3..96b11de 100755
--- a/scripts/storage/secondary/cloud-install-sys-tmplt
+++ b/scripts/storage/secondary/cloud-install-sys-tmplt
@@ -20,9 +20,9 @@
 
 
 usage() {
-  printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file>
[-h <hypervisor name: kvm|vmware|xenserver> ] [ -s <mgmt server secret key, if you
specified any when running cloudstack-setup-database, default is password>][-u <Url
to system vm template>] [-F <clean up system templates of specified hypervisor>]
[-e <Template suffix, e.g vhd, ova, qcow2>] [-o <Database server hostname or ip,
e.g localhost>] [-r <Database user name, e.g root>] [-d <Database password. Fllowed
by nothing if the password is empty>]\n" $(basename $0) >&2
+  printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file>
[-h <hypervisor name: kvm|vmware|xenserver|hyperv> ] [ -s <mgmt server secret key,
if you specified any when running cloudstack-setup-database, default is password>][-u <Url
to system vm template>] [-F <clean up system templates of specified hypervisor>]
[-e <Template suffix, e.g vhd, ova, qcow2>] [-o <Database server hostname or ip,
e.g localhost>] [-r <Database user name, e.g root>] [-d <Database password. Fllowed
by nothing if the password is empty>]\n" $(basename $0) >&2
   printf "or\n" >&2
-  printf "%s: -m <secondary storage mount point> -u <http url for system vm template>
[-h <hypervisor name: kvm|vmware|xenserver> ] [ -s <mgmt server secret key>]\n"
$(basename $0) >&2
+  printf "%s: -m <secondary storage mount point> -u <http url for system vm template>
[-h <hypervisor name: kvm|vmware|xenserver|hyperv> ] [ -s <mgmt server secret key>]\n"
$(basename $0) >&2
 }
 
 failed() {
@@ -161,6 +161,10 @@ then
    then
       ext="qcow2"
       templateId=(`mysql -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names
-U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type
= \"LXC\" and removed is null"`)
+   elif [ "$hyper" == "hyperv" ]
+   then
+      ext="vhd"
+      templateId=(`mysql -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names
-U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type
= \"Hyperv\" and removed is null"`)
    else
       usage
       failed 2


Mime
View raw message