Add AZ to dhcp and l3 in Pike
Related-Prod: PROD-35161
Related-Prod: PROD-35162
Change-Id: I49d47c7158f38f6e9b9af9637af890b9a841456f
diff --git a/neutron/files/pike/dhcp_agent.ini b/neutron/files/pike/dhcp_agent.ini
index b4bfda0..b08cda2 100644
--- a/neutron/files/pike/dhcp_agent.ini
+++ b/neutron/files/pike/dhcp_agent.ini
@@ -213,18 +213,35 @@
state_path=/var/lib/neutron
-[AGENT]
+[agent]
+#
+# From neutron.az.agent
+#
+
+# Availability zone of this node (string value)
+#availability_zone = nova
+# This parameter is optional, we already passing this from neutron.conf
+{%- if neutron.get('agents', {}).get('dhcp', {}).get('agent', {}).availability_zone is defined %}
+availability_zone = {{ neutron.agents.dhcp.agent.availability_zone }}
+{%- endif %}
#
# From neutron.base.agent
#
-# Seconds between nodes reporting state to server; should be less than agent_down_time, best if it is half or less than agent_down_time.
-# (floating point value)
+# Seconds between nodes reporting state to server; should be less than
+# agent_down_time, best if it is half or less than agent_down_time. (floating
+# point value)
#report_interval = 30
+{%- if neutron.get('agents', {}).get('dhcp', {}).get('agent', {}).report_interval is defined %}
+report_interval = {{ neutron.agents.dhcp.agent.report_interval }}
+{%- endif %}
# Log agent heartbeats (boolean value)
#log_agent_heartbeats = false
+{%- if neutron.get('agents', {}).get('dhcp', {}).get('agent', {}).log_agent_heartbeats is defined %}
+log_agent_heartbeats = {{ neutron.agents.dhcp.agent.log_agent_heartbeats }}
+{%- endif %}
[ovs]
diff --git a/neutron/files/pike/l3_agent.ini b/neutron/files/pike/l3_agent.ini
index 210ba3d..c112d58 100644
--- a/neutron/files/pike/l3_agent.ini
+++ b/neutron/files/pike/l3_agent.ini
@@ -292,6 +292,7 @@
# Availability zone of this node (string value)
#availability_zone = nova
+availability_zone = {{ neutron.availability_zone|default('nova') }}
#
# From neutron.base.agent