openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Update OVN metadata agent binary name

Browse Source 
During the transition from networking-ovn to the neutron tree, the name
of the metadata agent binary changed from networking-ovn-metadata-agent to
neutron-ovn-metadata-agent. This patch updates the service definition to
allow the metadata agent to function.

Change-Id: I69a4e5deed4b21e70afd7dac747375b81e98cb22
This commit is contained in:
James Denton 2020-06-03 10:14:10 -05:00
parent 8c859b3c9b
commit fccf1b75ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
templates/networking_ovn_metadata_agent.ini.j2 → templates/neutron_ovn_metadata_agent.ini.j2
View File

8
vars/main.yml
View File

@ -496,16 +496,16 @@ neutron_services:
neutron-ovn-controller: neutron-ovn-controller:
group: neutron_ovn_controller group: neutron_ovn_controller
service_en: False service_en: False
networking-ovn-metadata-agent: neutron-ovn-metadata-agent:
group: neutron_ovn_controller group: neutron_ovn_controller
systemd_user_name: root systemd_user_name: root
systemd_group_name: root systemd_group_name: root
service_name: networking-ovn-metadata-agent service_name: neutron-ovn-metadata-agent
service_en: "{{ neutron_plugin_type == 'ml2.ovn' }}" service_en: "{{ neutron_plugin_type == 'ml2.ovn' }}"
service_conf_path: "{{ neutron_conf_dir }}" service_conf_path: "{{ neutron_conf_dir }}"
service_conf: networking_ovn_metadata_agent.ini service_conf: neutron_ovn_metadata_agent.ini
service_rootwrap: rootwrap.d/ovn-plugin.filters service_rootwrap: rootwrap.d/ovn-plugin.filters
execstarts: "{{ neutron_bin }}/networking-ovn-metadata-agent --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/plugins/ml2/ml2_conf.ini --config-file {{ neutron_conf_dir }}/networking_ovn_metadata_agent.ini" execstarts: "{{ neutron_bin }}/neutron-ovn-metadata-agent --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/plugins/ml2/ml2_conf.ini --config-file {{ neutron_conf_dir }}/neutron_ovn_metadata_agent.ini"
config_overrides: "{{ neutron_ovn_metadata_agent_ini_overrides }}" config_overrides: "{{ neutron_ovn_metadata_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
init_config_overrides: "{{ neutron_ovn_metadata_agent_init_overrides }}" init_config_overrides: "{{ neutron_ovn_metadata_agent_init_overrides }}"