Merge "Add dvr_no_external l3 dvr agent mode"

ansible/inventory/all-in-one

@@ -6,9 +6,19 @@ localhost       ansible_connection=local
 [network]
 localhost       ansible_connection=local
 
-[compute]
+# inner-compute is the groups of compute nodes which do not have
+# external reachability
+[inner-compute]
+
+# external-compute is the groups of compute nodes which can reach
+# outside
+[external-compute]
 localhost       ansible_connection=local
 
+[compute:children]
+inner-compute
+external-compute
+
 [storage]
 localhost       ansible_connection=local
 

ansible/inventory/multinode

@@ -15,9 +15,19 @@ control03
 network01
 network02
 
-[compute]
+# inner-compute is the groups of compute nodes which do not have
+# external reachability
+[inner-compute]
+
+# external-compute is the groups of compute nodes which can reach
+# outside
+[external-compute]
 compute01
 
+[compute:children]
+inner-compute
+external-compute
+
 [monitoring]
 monitoring01
 

ansible/roles/neutron/templates/l3_agent.ini.j2

@@ -3,8 +3,10 @@
 {% if enable_neutron_dvr | bool %}
 {% if inventory_hostname in groups['network'] %}
 agent_mode = dvr_snat
-{% elif inventory_hostname in groups['compute'] %}
+{% elif inventory_hostname in groups['external-compute'] %}
 agent_mode = dvr
+{% elif inventory_hostname in groups['inner-compute'] %}
+agent_mode = dvr_no_external
 {% endif %}
 {% else %}
 agent_mode = legacy

releasenotes/notes/add-neutron-dvr-no-external-0a8e0f2d967cf078.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - Add dvr_no_external l3 dvr agent mode.
+    Introduce inner-compute and external-compute nodes group in inventory
+    file to distinguish compute nodes which do not have external reachability
+    from compute nodes which can reach outside.