----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/22554/#review46657 -----------------------------------------------------------
Ship it! 477a812a6f7aaab74122c11488713f417dfe4d89 on master 2498f65683bd529b2b03bac9a6cfd2fdbf65aca2 on 4.4-forward doesn't apply cleanly on 4.4 - daan Hoogland On June 23, 2014, 3:53 p.m., John Dilley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/22554/ > ----------------------------------------------------------- > > (Updated June 23, 2014, 3:53 p.m.) > > > Review request for cloudstack and Santhosh Edukulla. > > > Bugs: CLOUDSTACK-6909 > https://issues.apache.org/jira/browse/CLOUDSTACK-6909 > > > Repository: cloudstack-git > > > Description > ------- > > Fix marvin's handling of details field for primary and secondary storage to > cope with SMB credentials. This allows Hyper-V to work. > > > Diffs > ----- > > tools/marvin/marvin/configGenerator.py 191f08e > tools/marvin/marvin/deployDataCenter.py 22b78ab > > Diff: https://reviews.apache.org/r/22554/diff/ > > > Testing > ------- > > Tested deploydataCenter with this JSON: > > { > "dbSvr":{ > "dbSvr":"10.220.137.39", > "passwd":"cloud", > "db":"cloud", > "port":3306, > "user":"cloud" > }, > "zones":[ > { > "name":"XenRT-Zone-0", > "guestcidraddress":"192.168.200.0/24", > "dns1":"10.220.160.11", > "physical_networks":[ > { > "XRT_VLANRangeSize":10, > "name":"AdvPhyNetwork", > "providers":[ > { > "broadcastdomainrange":"ZONE", > "name":"VirtualRouter" > }, > { > "broadcastdomainrange":"ZONE", > "name":"VpcVirtualRouter" > }, > { > "broadcastdomainrange":"ZONE", > "name":"InternalLbVm" > } > ], > "broadcastdomainrange":"Zone", > "vlan":"3000-3009", > "traffictypes":[ > { > "typ":"Guest" > }, > { > "typ":"Management" > }, > { > "typ":"Public" > } > ], > "isolationmethods":[ > "VLAN" > ] > } > ], > "ipranges":[ > { > "startip":"10.220.164.0", > "endip":"10.220.164.9", > "netmask":"255.255.240.0", > "XRT_GuestIPRangeSize":10, > "gateway":"10.220.160.1" > } > ], > "networktype":"Advanced", > "pods":[ > { > "XRT_PodIPRangeSize":10, > "name":"XenRT-Zone-0-Pod-0", > "endip":"10.220.164.39", > "startip":"10.220.164.30", > "netmask":"255.255.240.0", > "clusters":[ > { > "XRT_HyperVHostIds":"0", > "clustername":"XenRT-Zone-0-Pod-0-Cluster-0", > "hypervisor":"hyperv", > "primaryStorages":[ > { > "url":"cifs://10.220.163.45/storage/primary", > "name":"XenRT-Zone-0-Pod-0-Primary-Store", > "details":{ > "user":"Administrator", > "password":"xenroot01T", > "domain":"XSQA" > } > } > ], > "clustertype":"CloudManaged", > "hosts":[ > { > "url":"http://10.220.163.45";, > "username":"root", > "password":"xenroot" > } > ], > "XRT_Hosts":1 > } > ], > "gateway":"10.220.160.1" > } > ], > "internaldns1":"10.220.160.11", > "secondaryStorages":[ > { > "url":"cifs://10.220.163.45/storage/secondary", > "details":{ > "domain":"XSQA", > "password":"xenroot01T", > "user":"Administrator" > }, > "provider":"SMB" > } > ] > } > ], > "mgtSvr":[ > { > "mgtSvrIp":"10.220.137.39", > "passwd":"xenroot", > "port":8096, > "user":"root" > } > ] > } > > > Thanks, > > John Dilley > >
