x/packstack
Code Issues Proposed changes

Make sure agent config gets done on api hosts

Browse Source 
Change-Id: I0bfec0ba88c81f458052dfa2d5c70127c6ba6cea
This commit is contained in:
Terry Wilson 2013-09-05 12:14:26 -05:00
parent 98139fa406
commit a8d9b26935
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/plugins/neutron_350.py
View File

@ -414,7 +414,7 @@ def get_values(val):
return [x.strip() for x in val.split(',')] if val else [] return [x.strip() for x in val.split(',')] if val else []
def createL2AgentManifests(config): def createL2AgentManifests(config):
global compute_hosts, dhcp_host, l3_hosts global api_hosts, compute_hosts, dhcp_host, l3_hosts
if controller.CONF["CONFIG_NEUTRON_L2_PLUGIN"] == "openvswitch": if controller.CONF["CONFIG_NEUTRON_L2_PLUGIN"] == "openvswitch":
host_var = 'CONFIG_NEUTRON_OVS_HOST' host_var = 'CONFIG_NEUTRON_OVS_HOST'
@ -440,7 +440,7 @@ def createL2AgentManifests(config):
# Install l2 agents on every compute host in addition to any hosts listed # Install l2 agents on every compute host in addition to any hosts listed
# specifically for the l2 agent # specifically for the l2 agent
for host in compute_hosts | dhcp_hosts | l3_hosts: for host in api_hosts | compute_hosts | dhcp_hosts | l3_hosts:
controller.CONF[host_var] = host controller.CONF[host_var] = host
manifestfile = "%s_neutron.pp" % (host,) manifestfile = "%s_neutron.pp" % (host,)
manifestdata = getManifestTemplate(template_name) manifestdata = getManifestTemplate(template_name)