Browse Source

Remove deprecated compute groups

The concept of splitting the compute group into external/internal just
to specify agent_mode for Neutron DVR was deemed to be heavy handed, and
depreacated in the Pike cycle.

Now that Rocky has been released we can remove these completely for Stein.

Change-Id: I28a1eba7f40fee55a7ec41c27451e39e4d7fd8f0
tags/8.0.0.0b1
Paul Bourke 6 months ago
parent
commit
cf609ba3cc

+ 1
- 1
ansible/group_vars/all.yml View File

@@ -728,7 +728,7 @@ neutron_tenant_network_types: "vxlan"
728 728
 
729 729
 # valid values: ["dvr", "dvr_no_external"]
730 730
 neutron_compute_dvr_mode: "dvr"
731
-computes_need_external_bridge: "{{ enable_neutron_dvr | bool and (neutron_compute_dvr_mode == 'dvr' or inventory_hostname in groups['external-compute']) or enable_neutron_provider_networks | bool or enable_opendaylight | bool and neutron_plugin_agent != 'vmware_dvs' and not enable_onos | bool }}"
731
+computes_need_external_bridge: "{{ enable_neutron_dvr | bool and neutron_compute_dvr_mode == 'dvr' or enable_neutron_provider_networks | bool or enable_opendaylight | bool and neutron_plugin_agent != 'vmware_dvs' and not enable_onos | bool }}"
732 732
 
733 733
 # Default DNS resolvers for virtual networks
734 734
 neutron_dnsmasq_dns_servers: "1.1.1.1,8.8.8.8,8.8.4.4"

+ 1
- 15
ansible/inventory/all-in-one View File

@@ -6,23 +6,9 @@ localhost       ansible_connection=local
6 6
 [network]
7 7
 localhost       ansible_connection=local
8 8
 
9
-# inner-compute is the groups of compute nodes which do not have
10
-# external reachability.
11
-# DEPRECATED, the group will be removed in S release of OpenStack,
12
-# use variable neutron_compute_dvr_mode instead.
13
-[inner-compute]
14
-
15
-# external-compute is the groups of compute nodes which can reach
16
-# outside.
17
-# DEPRECATED, the group will be removed in S release of OpenStack,
18
-# use variable neutron_compute_dvr_mode instead.
19
-[external-compute]
9
+[compute]
20 10
 localhost       ansible_connection=local
21 11
 
22
-[compute:children]
23
-inner-compute
24
-external-compute
25
-
26 12
 [storage]
27 13
 localhost       ansible_connection=local
28 14
 

+ 1
- 15
ansible/inventory/multinode View File

@@ -15,23 +15,9 @@ control03
15 15
 network01
16 16
 network02
17 17
 
18
-# inner-compute is the groups of compute nodes which do not have
19
-# external reachability.
20
-# DEPRECATED, the group will be removed in S release of OpenStack,
21
-# use variable neutron_compute_dvr_mode instead.
22
-[inner-compute]
23
-
24
-# external-compute is the groups of compute nodes which can reach
25
-# outside.
26
-# DEPRECATED, the group will be removed in S release of OpenStack,
27
-# use variable neutron_compute_dvr_mode instead.
28
-[external-compute]
18
+[compute]
29 19
 compute01
30 20
 
31
-[compute:children]
32
-inner-compute
33
-external-compute
34
-
35 21
 [monitoring]
36 22
 monitoring01
37 23
 

+ 0
- 10
ansible/roles/neutron/tasks/precheck.yml View File

@@ -48,16 +48,6 @@
48 48
   run_once: true
49 49
   with_items: "{{ tenant_network_types }}"
50 50
 
51
-- name: Checking for deprecated inner-compute and external-compute groups
52
-  local_action:
53
-    module: debug
54
-    msg: "WARNING: inner-compute and external-compute groups are DEPRECATED"
55
-  changed_when: false
56
-  run_once: True
57
-  when:
58
-    - (groups['inner-compute'] | default([]) | length > 0
59
-       or groups['external-compute'] | default([]) | length > 0)
60
-
61 51
 - name: Checking whether Ironic enabled
62 52
   local_action: fail msg="Ironic must be enabled when using networking-baremetal/ironic-neutron-agent"
63 53
   changed_when: false

+ 1
- 5
ansible/roles/neutron/templates/l3_agent.ini.j2 View File

@@ -4,11 +4,7 @@
4 4
 {% if enable_neutron_dvr | bool %}
5 5
 {% if inventory_hostname in groups['network'] %}
6 6
 agent_mode = dvr_snat
7
-{% elif inventory_hostname in groups['external-compute'] %}
8
-agent_mode = dvr
9
-{% elif inventory_hostname in groups['inner-compute'] %}
10
-agent_mode = dvr_no_external
11
-{% elif inventory_hostname in groups['compute'] %}
7
+{% else %}
12 8
 agent_mode = {{ neutron_compute_dvr_mode }}
13 9
 {% endif %}
14 10
 {% else %}

+ 2
- 2
contrib/dev/vagrant/bootstrap.sh View File

@@ -176,14 +176,14 @@ function configure_kolla_cli {
176 176
     if [ "$MODE" == 'aio' ]; then
177 177
         kolla-cli setdeploy local
178 178
         kolla-cli host add localhost
179
-        for group in control deployment external-compute monitoring network storage; do
179
+        for group in control deployment compute monitoring network storage; do
180 180
             kolla-cli group addhost $group localhost
181 181
         done
182 182
     else
183 183
         for node_num in $(seq 1 ${NUMBER_OF_COMPUTE_NODES}); do
184 184
             node_name="compute0${node_num}"
185 185
             kolla-cli host add $node_name
186
-            kolla-cli group addhost external-compute $node_name
186
+            kolla-cli group addhost compute $node_name
187 187
         done
188 188
 
189 189
         for node_num in $(seq 1 ${NUMBER_OF_STORAGE_NODES}); do

+ 7
- 0
releasenotes/notes/remove-deprecated-compute-groups-5273e945720edddc.yaml View File

@@ -0,0 +1,7 @@
1
+---
2
+upgrade:
3
+  - |
4
+    Previously deprecated compute groups 'inner-compute' and 'external-compute'
5
+    have now been removed in favor of the more simple 'compute' group. Please
6
+    be sure to update your inventory.  Set 'neutron_compute_dvr_mode' on nodes
7
+    with which you wish to customise the value for neutron's 'agent_mode'.

Loading…
Cancel
Save