x
/
packstack
Code Issues Proposed changes

Removing conflict 

Change-Id: I68f292f922341a43d93c5781740b996cc66444ed
This commit is contained in:
Derek Higgins 2013-02-11 09:57:18 -05:00
parent 5abeb1ab39
commit f6de12025d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/plugins/cinder_250.py
View File

@ -85,10 +85,7 @@ def initSequences(controller):
{'title': 'Adding Cinder manifest entries', 'functions':[createmanifest]}
]
controller.addSequence("Installing OpenStack Cinder", [], [], cindersteps)
<<<<<<< HEAD
=======
>>>>>>> cba297d... Fail when Nova API, Nova network and Swift hosts are not set as IP addresses
def checkcindervg():
server = utils.ScriptRunner(controller.CONF['CONFIG_CINDER_HOST'])