x/packstack
Code Issues Proposed changes

Merge "Removed SQL password in sql_connection for compute hosts"

Browse Source
This commit is contained in:
Jenkins
2013-06-05 11:39:18 +00:00
committed by Gerrit Code Review
parent 2ed81e6e24 621822bed7
commit 283dba0985
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packstack/plugins/nova_300.py
View File

@@ -425,8 +425,23 @@ def createvncproxymanifest(config):
def createcommonmanifest(config): def createcommonmanifest(config):
dirty = controller.CONF["CONFIG_NOVA_COMPUTE_HOSTS"].split(",")
compnodes = [i.strip() for i in dirty if i.strip()]
conductor = config['CONFIG_NOVA_CONDUCTOR_HOST']
dbhost = config['CONFIG_MYSQL_HOST']
for manifestfile, marker in manifestfiles.getFiles(): for manifestfile, marker in manifestfiles.getFiles():
if manifestfile.endswith("_nova.pp"): if manifestfile.endswith("_nova.pp"):
host, manifest = manifestfile.split('_', 1)
host = host.strip()
if host != conductor and host in compnodes:
perms = "nova"
else:
perms = "nova:%(CONFIG_NOVA_DB_PW)s" % config
config['CONFIG_NOVA_SQL_CONN'] = ("mysql://%s@%s/nova"
% (perms, dbhost))
data = getManifestTemplate("nova_common.pp") data = getManifestTemplate("nova_common.pp")
appendManifestFile(os.path.split(manifestfile)[1], data) appendManifestFile(os.path.split(manifestfile)[1], data)

2
packstack/puppet/templates/nova_common.pp
View File

@@ -9,7 +9,7 @@ nova_config{
class {"nova": class {"nova":
glance_api_servers => "%(CONFIG_GLANCE_HOST)s:9292", glance_api_servers => "%(CONFIG_GLANCE_HOST)s:9292",
sql_connection => "mysql://nova:%(CONFIG_NOVA_DB_PW)s@%(CONFIG_MYSQL_HOST)s/nova", sql_connection => "%(CONFIG_NOVA_SQL_CONN)s",
qpid_hostname => "%(CONFIG_QPID_HOST)s", qpid_hostname => "%(CONFIG_QPID_HOST)s",
rpc_backend => 'nova.openstack.common.rpc.impl_qpid', rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
verbose => 'True', verbose => 'True',