Fixes Neutron firewall rule creation on wrong host
The firewall rules for neutron were being created on the nova compute host instead of the neutron host. Change-Id: Iaa343bb7724c8efaa6d717ee77f5a26dbacb8587 Fixes: rhbz#1023561
This commit is contained in:
@@ -366,6 +366,11 @@ def createManifest(config):
|
||||
if host in api_hosts:
|
||||
manifest_file = "%s_neutron.pp" % (host,)
|
||||
manifest_data = getManifestTemplate("neutron_api.pp")
|
||||
# Firewall Rules
|
||||
config['FIREWALL_ALLOWED'] = ",".join(["'%s'" % i for i in q_hosts])
|
||||
config['FIREWALL_SERVICE_NAME'] = "neutron"
|
||||
config['FIREWALL_PORTS'] = "'9696'"
|
||||
manifest_data += getManifestTemplate("firewall.pp")
|
||||
appendManifestFile(manifest_file, manifest_data, 'neutron')
|
||||
|
||||
# Set up any l2 plugin configs we need anywhere we install neutron
|
||||
@@ -377,12 +382,6 @@ def createManifest(config):
|
||||
elif controller.CONF['CONFIG_NEUTRON_L2_PLUGIN'] == 'linuxbridge':
|
||||
manifest_data = getManifestTemplate("neutron_lb_plugin.pp")
|
||||
appendManifestFile(manifest_file, manifest_data, 'neutron')
|
||||
# Firewall Rules
|
||||
config['FIREWALL_ALLOWED'] = ",".join(["'%s'" % i for i in q_hosts])
|
||||
config['FIREWALL_SERVICE_NAME'] = "neutron"
|
||||
config['FIREWALL_PORTS'] = "'9696'"
|
||||
manifest_data = getManifestTemplate("firewall.pp")
|
||||
appendManifestFile(manifest_file, manifest_data, 'neutron')
|
||||
|
||||
def createKeystoneManifest(config):
|
||||
manifestfile = "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST']
|
||||
|
||||
Reference in New Issue
Block a user