x/packstack
Code Issues Proposed changes

Removed some duplicate code

Browse Source 
Duplicate code in manifest generation
This commit is contained in:
Derek Higgins 2012-11-28 16:19:48 -05:00
parent 82cb714192
commit 6426ac5c76
7 changed files with 21 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/modules/ospluginutils.py
View File

@ -33,6 +33,8 @@ def getManifestTemplate(template_name):
return fp.read()%controller.CONF
def appendManifestFile(manifest_name, data):
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, manifest_name)
if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)

2
packstack/plugins/cinder_250.py
View File

@ -21,8 +21,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/cinder.pp')
def initConfig(controllerObject):
global controller
controller = controllerObject

2
packstack/plugins/glance_200.py
View File

@ -22,8 +22,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/glance.pp')
def initConfig(controllerObject):
global controller
controller = controllerObject

22
packstack/plugins/keystone_100.py
View File

@ -11,6 +11,8 @@ import packstack.installer.engine_validators as validate
from packstack.installer import basedefs
import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import gethostlist, getManifestTemplate, appendManifestFile
# Controller object will be initialized from main flow
controller = None
@ -20,9 +22,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/keystone.pp')
def initConfig(controllerObject):
global controller
controller = controllerObject
@ -83,17 +82,6 @@ def initSequences(controller):
controller.addSequence("Installing Keystone", [], [], keystonesteps)
def createmanifest():
with open(PUPPET_MANIFEST_TEMPLATE) as fp:
manifestdata = fp.read()
manifestdata = manifestdata%controller.CONF
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST'])
if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
with open(manifestfile, 'a') as fp:
fp.write("\n")
fp.write(manifestdata)
manifestfile = "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST']
manifestdata = getManifestTemplate("keystone.pp")
appendManifestFile(manifestfile, manifestdata)

20
packstack/plugins/mysql_001.py
View File

@ -9,7 +9,7 @@ import packstack.installer.engine_validators as validate
from packstack.installer import basedefs
import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import gethostlist
from packstack.modules.ospluginutils import gethostlist, getManifestTemplate, appendManifestFile
# Controller object will be initialized from main flow
controller = None
@ -20,8 +20,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/mysql.pp')
def initConfig(controllerObject):
global controller
controller = controllerObject
@ -83,17 +81,7 @@ def initSequences(controller):
controller.addSequence("Installing MySQL", [], [], mysqlsteps)
def createmanifest():
with open(PUPPET_MANIFEST_TEMPLATE) as fp:
manifestdata = fp.read()
manifestdata = manifestdata%controller.CONF
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_mysql.pp"%controller.CONF['CONFIG_MYSQL_HOST'])
if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
with open(manifestfile, 'a') as fp:
fp.write("\n")
fp.write(manifestdata)
manifestfile = "%s_mysql.pp"%controller.CONF['CONFIG_MYSQL_HOST']
manifestdata = getManifestTemplate("mysql.pp")
appendManifestFile(manifestfile, manifestdata)

22
packstack/plugins/openstack_client_400.py
View File

@ -11,6 +11,8 @@ import packstack.installer.engine_validators as validate
from packstack.installer import basedefs
import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
# Controller object will be initialized from main flow
controller = None
@ -20,9 +22,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/openstack_client.pp')
def initConfig(controllerObject):
global controller
controller = controllerObject
@ -62,17 +61,6 @@ def initSequences(controller):
controller.addSequence("Installing OpenStack Client", [], [], osclientsteps)
def createmanifest():
with open(PUPPET_MANIFEST_TEMPLATE) as fp:
manifestdata = fp.read()
manifestdata = manifestdata%controller.CONF
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST'])
if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
with open(manifestfile, 'a') as fp:
fp.write("\n")
fp.write(manifestdata)
manifestfile = "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST']
manifestdata = getManifestTemplate("openstack_client.pp")
appendManifestFile(manifestfile, manifestdata)

21
packstack/plugins/qpid_002.py
View File

@ -10,6 +10,8 @@ import packstack.installer.engine_validators as validate
from packstack.installer import basedefs
import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
# Controller object will be initialized from main flow
controller = None
@ -19,8 +21,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/qpid.pp')
def initConfig(controllerObject):
global controller
controller = controllerObject
@ -60,17 +60,6 @@ def initSequences(controller):
controller.addSequence("Installing QPID", [], [], qpidsteps)
def createmanifest():
with open(PUPPET_MANIFEST_TEMPLATE) as fp:
manifestdata = fp.read()
manifestdata = manifestdata%controller.CONF
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_qpid.pp"%controller.CONF['CONFIG_QPID_HOST'])
if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
with open(manifestfile, 'a') as fp:
fp.write("\n")
fp.write(manifestdata)
manifestfile = "%s_qpid.pp"%controller.CONF['CONFIG_QPID_HOST']
manifestdata = getManifestTemplate("qpid.pp")
appendManifestFile(manifestfile, manifestdata)