Handle changes of L3 and metadata agents' configs in case of DVR
The issue was found during debugging in a DVR environment, when
neutron-metadata-agent was not restarted after the config file has
changed to reference the correct nova metadata server address.
Change-Id: I06162cb305599bd0349c4c91418aa2423d212921
diff --git a/neutron/compute.sls b/neutron/compute.sls
index bd6e3e0..bfefb53 100644
--- a/neutron/compute.sls
+++ b/neutron/compute.sls
@@ -50,6 +50,18 @@
- neutron-l3-agent
- neutron-metadata-agent
+neutron_dvr_agents:
+ service.running:
+ - enable: true
+ - names:
+ - neutron-l3-agent
+ - neutron-metadata-agent
+ - watch:
+ - file: /etc/neutron/l3_agent.ini
+ - file: /etc/neutron/metadata_agent.ini
+ - require:
+ - pkg: neutron_dvr_packages
+
/etc/neutron/l3_agent.ini:
file.managed:
- source: salt://neutron/files/{{ compute.version }}/l3_agent.ini
@@ -57,7 +69,7 @@
- watch_in:
- service: neutron_compute_services
- require:
- - pkg: neutron_compute_packages
+ - pkg: neutron_dvr_packages
/etc/neutron/metadata_agent.ini:
file.managed:
@@ -66,7 +78,7 @@
- watch_in:
- service: neutron_compute_services
- require:
- - pkg: neutron_compute_packages
+ - pkg: neutron_dvr_packages
{% endif %}