Updated Branches: refs/heads/quickcloud 55eb2d64b -> a27a42211
QuickCloud: allow specification of network offering name in datacenter config. The deployDatacenter python script will use this to pick the network offering during creation of the default network in a basic zone Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a27a4221 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a27a4221 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a27a4221 Branch: refs/heads/quickcloud Commit: a27a42211b81ecbeb271f8c8ab049e6adffe3d26 Parents: 55eb2d6 Author: Chiradeep Vittal <chirad...@apache.org> Authored: Tue Mar 26 14:11:36 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Tue Mar 26 14:11:36 2013 -0700 ---------------------------------------------------------------------- tools/devcloud/quickcloud.cfg | 1 + tools/marvin/marvin/deployDataCenter.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a27a4221/tools/devcloud/quickcloud.cfg ---------------------------------------------------------------------- diff --git a/tools/devcloud/quickcloud.cfg b/tools/devcloud/quickcloud.cfg index 0e1fb4f..a2613d2 100644 --- a/tools/devcloud/quickcloud.cfg +++ b/tools/devcloud/quickcloud.cfg @@ -54,6 +54,7 @@ "securitygroupenabled": "true", "localstorageenabled": "true", "networktype": "Basic", + "networkofferingname": "QuickCloudNoServices", "pods": [ { "endip": "192.168.56.220", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a27a4221/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 42bc5f9..d365395 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -299,10 +299,11 @@ class deployDataCenters(): if zone.networktype == "Basic": listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd() - listnetworkoffering.name = "DefaultSharedNetscalerEIPandELBNetworkOffering" \ if len(filter(lambda x : x.typ == 'Public', zone.physical_networks[0].traffictypes)) > 0 \ else "DefaultSharedNetworkOfferingWithSGService" + if zone.networkofferingname is not None: + listnetworkoffering.name = zone.networkofferingname listnetworkofferingresponse = \ self.apiClient.listNetworkOfferings(listnetworkoffering)
