etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add required provider for NFS storage 

Changing the sandbox scripts and the marvin-checkin-test configurations
to include the required 'provider' argument when adding an image store
(secondary storage)

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-06-20 15:50:48 +05:30
parent c295341cbd
commit 694391ad04
8 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/dev/advanced.cfg
View File

@ -125,7 +125,8 @@
"internaldns1": "10.147.28.6",
"secondaryStorages": [
{
"url": "nfs://10.147.28.6:/export/home/sandbox/secondary"
"url": "nfs://10.147.28.6:/export/home/sandbox/secondary",
"provider" : "NFS"
}
]
}

3
setup/dev/advancedsg.cfg
View File

@ -94,7 +94,8 @@
"internaldns1": "10.147.28.6",
"secondaryStorages": [
{
"url": "nfs://10.147.28.6:/export/home/sandbox/sstor"
"url": "nfs://10.147.28.6:/export/home/sandbox/sstor",
"provider" : "NFS"
}
]
}

3
setup/dev/basic.cfg
View File

@ -90,7 +90,8 @@
"internaldns1": "8.8.8.8",
"secondaryStorages": [
{
"url": "nfs://nfsstor:/export/home/sandbox/secondary"
"url": "nfs://nfsstor:/export/home/sandbox/secondary",
"provider" : "NFS"
}
]
}

4
tools/marvin/marvin/configGenerator.py
View File

@ -181,13 +181,13 @@ class primaryStorage():
class secondaryStorage():
def __init__(self):
self.url = None
self.providerName = None
self.provider = None
self.details = None
class cacheStorage():
def __init__(self):
self.url = None
self.providerName = None
self.provider = None
self.details = None
class s3():

7
tools/marvin/marvin/deployDataCenter.py
View File

@ -140,7 +140,7 @@ class deployDataCenters():
for secondary in secondaryStorages:
secondarycmd = addImageStore.addImageStoreCmd()
secondarycmd.url = secondary.url
secondarycmd.provider = secondary.providerName
secondarycmd.provider = secondary.provider
secondarycmd.details = []
if isinstance(secondary.details, list):
@ -156,7 +156,7 @@ class deployDataCenters():
for cache in cacheStorages:
cachecmd = createCacheStore.createCacheStoreCmd()
cachecmd.url = cache.url
cachecmd.provider = cache.providerName
cachecmd.provider = cache.provider
cachecmd.zoneid = zoneId
cachecmd.details = []
for item in cache.details:
@ -507,14 +507,11 @@ class deployDataCenters():
def configureS3(self, s3):
if s3 is None:
return
command = addS3.addS3Cmd()
self.copyAttributesToCommand(s3, command)
self.apiClient.addS3(command)
def deploy(self):

1
tools/marvin/marvin/sandbox/advanced/advanced_env.py
View File

@ -113,6 +113,7 @@ def describeResources(config):
secondary = secondaryStorage()
secondary.url = config.get('cloudstack', 'secondary.pool')
secondary.provider = "NFS"
z.secondaryStorages.append(secondary)
'''Add zone'''

1
tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
View File

@ -97,6 +97,7 @@ def describeResources(config):
secondary = secondaryStorage()
secondary.url = config.get('cloudstack', 'secondary.pool')
secondary.provider = "NFS"
z.secondaryStorages.append(secondary)
'''Add zone'''

1
tools/marvin/marvin/sandbox/basic/basic_env.py
View File

@ -95,6 +95,7 @@ def describeResources(config):
secondary = secondaryStorage()
secondary.url = config.get('cloudstack', 'secondary.pool')
secondary.provider = "NFS"
z.secondaryStorages.append(secondary)
'''Add zone'''