x/packstack
Code Issues Proposed changes

Define PUPPET_MANIFEST_DIR in basedefs

Browse Source 
Also moving it to /var/tmp/uuid
This commit is contained in:
Derek Higgins
2012-11-28 07:04:08 -05:00
parent b0be8d9a0a
commit bdd0e30f14
9 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packstack/plugins/openstack_client_400.py
View File

@@ -20,7 +20,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPET_MANIFEST_DIR = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/openstack_client.pp')
@@ -67,9 +66,9 @@ def createmanifest():
manifestdata = fp.read()
manifestdata = manifestdata%controller.CONF
if not os.path.exists(PUPPET_MANIFEST_DIR):
os.mkdir(PUPPET_MANIFEST_DIR)
manifestfile = os.path.join(PUPPET_MANIFEST_DIR, "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST'])
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)