apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for injecting the VMWare templates across the board, and in the packages too

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2010-08-26 19:15:15 -07:00
parent e992e8732d
commit cebd1da99c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud.spec
View File

@ -591,8 +591,7 @@ fi
%{_datadir}/%{name}/setup/create-index-fk.sql %{_datadir}/%{name}/setup/create-index-fk.sql
%{_datadir}/%{name}/setup/create-schema.sql %{_datadir}/%{name}/setup/create-schema.sql
%{_datadir}/%{name}/setup/server-setup.sql %{_datadir}/%{name}/setup/server-setup.sql
%{_datadir}/%{name}/setup/templates.kvm.sql %{_datadir}/%{name}/setup/templates.*.sql
%{_datadir}/%{name}/setup/templates.xenserver.sql
%{_datadir}/%{name}/setup/deploy-db-dev.sh %{_datadir}/%{name}/setup/deploy-db-dev.sh
%{_datadir}/%{name}/setup/server-setup.xml %{_datadir}/%{name}/setup/server-setup.xml
%{_datadir}/%{name}/setup/data-20to21.sql %{_datadir}/%{name}/setup/data-20to21.sql

3
debian/cloud-setup.install vendored
View File

@ -4,8 +4,7 @@
/usr/share/cloud/setup/create-index-fk.sql /usr/share/cloud/setup/create-index-fk.sql
/usr/share/cloud/setup/create-schema.sql /usr/share/cloud/setup/create-schema.sql
/usr/share/cloud/setup/server-setup.sql /usr/share/cloud/setup/server-setup.sql
/usr/share/cloud/setup/templates.kvm.sql /usr/share/cloud/setup/templates.*.sql
/usr/share/cloud/setup/templates.xenserver.sql
/usr/share/cloud/setup/deploy-db-dev.sh /usr/share/cloud/setup/deploy-db-dev.sh
/usr/share/cloud/setup/server-setup.xml /usr/share/cloud/setup/server-setup.xml
/usr/share/cloud/setup/data-20to21.sql /usr/share/cloud/setup/data-20to21.sql

4
setup/bindir/cloud-setup-databases.in
View File

@ -43,7 +43,7 @@ except ImportError:
#---------------------- option parsing and command line checks ------------------------ #---------------------- option parsing and command line checks ------------------------
usage = """%prog user:password@mysqlhost:port <kvm|xenserver> [--deploy-as=rootuser:rootpassword] [--auto=/path/to/server-setup.xml] usage = """%prog user:password@mysqlhost:port <kvm|xenserver|vmware> [--deploy-as=rootuser:rootpassword] [--auto=/path/to/server-setup.xml]
This command sets up the CloudStack Management Server and CloudStack Usage Server database configuration (connection credentials and host information) based on the first argument. This command sets up the CloudStack Management Server and CloudStack Usage Server database configuration (connection credentials and host information) based on the first argument.
@ -224,7 +224,7 @@ def setupconfigfile(fn,myipaddr,username,password,host,port):
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if len(args) != 2: e("Wrong number of arguments") if len(args) != 2: e("Wrong number of arguments")
if args[1] not in ["xenserver","kvm"]: e("You need to specify either xenserver or kvm after the database credentials") if args[1] not in ["xenserver","kvm","vmware"]: e("You need to specify either xenserver or kvm or vmware after the database credentials")
virttech = args[1] virttech = args[1]
user,password,host,port= get_creds(parser,options,args) user,password,host,port= get_creds(parser,options,args)

3
wscript
View File

@ -759,6 +759,9 @@ def deploydb_xenserver(ctx):
def deploydb_kvm(ctx): def deploydb_kvm(ctx):
"""re-deploys the database using the MySQL connection information and the KVM templates.sql""" """re-deploys the database using the MySQL connection information and the KVM templates.sql"""
return deploydb(ctx,"kvm") return deploydb(ctx,"kvm")
def deploydb_vmware(ctx):
"""re-deploys the database using the MySQL connection information and the KVM templates.sql"""
return deploydb(ctx,"vmware")
def run(args): def run(args):
"""runs the management server""" """runs the management server"""