summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2018-10-31 11:43:12 +0000
committerPaul Bourke <paul.bourke@oracle.com>2018-11-06 11:45:43 +0000
commitcf609ba3cc82001822b4b050b595187d14235edd (patch)
treee23bdd6c4892ae7e376eb88b781e064574a4c906
parentc8a89e6256304348127706eacafa57b72d3ebaf3 (diff)
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
Notes
Notes (review): Code-Review+2: Mark Goddard <mark@stackhpc.com> Code-Review+2: Eduardo Gonzalez <dabarren@gmail.com> Workflow+1: Eduardo Gonzalez <dabarren@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 06 Nov 2018 16:13:23 +0000 Reviewed-on: https://review.openstack.org/614475 Project: openstack/kolla-ansible Branch: refs/heads/master
-rw-r--r--ansible/group_vars/all.yml2
-rw-r--r--ansible/inventory/all-in-one16
-rw-r--r--ansible/inventory/multinode16
-rw-r--r--ansible/roles/neutron/tasks/precheck.yml10
-rw-r--r--ansible/roles/neutron/templates/l3_agent.ini.j26
-rw-r--r--contrib/dev/vagrant/bootstrap.sh4
-rw-r--r--releasenotes/notes/remove-deprecated-compute-groups-5273e945720edddc.yaml7
7 files changed, 13 insertions, 48 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 557a448..7b77018 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -728,7 +728,7 @@ neutron_tenant_network_types: "vxlan"
728 728
729# valid values: ["dvr", "dvr_no_external"] 729# valid values: ["dvr", "dvr_no_external"]
730neutron_compute_dvr_mode: "dvr" 730neutron_compute_dvr_mode: "dvr"
731computes_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 }}" 731computes_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# Default DNS resolvers for virtual networks 733# Default DNS resolvers for virtual networks
734neutron_dnsmasq_dns_servers: "1.1.1.1,8.8.8.8,8.8.4.4" 734neutron_dnsmasq_dns_servers: "1.1.1.1,8.8.8.8,8.8.4.4"
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index f549bad..233966e 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -6,23 +6,9 @@ localhost ansible_connection=local
6[network] 6[network]
7localhost ansible_connection=local 7localhost ansible_connection=local
8 8
9# inner-compute is the groups of compute nodes which do not have 9[compute]
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]
20localhost ansible_connection=local 10localhost ansible_connection=local
21 11
22[compute:children]
23inner-compute
24external-compute
25
26[storage] 12[storage]
27localhost ansible_connection=local 13localhost ansible_connection=local
28 14
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 41c911e..7e6ff6d 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -15,23 +15,9 @@ control03
15network01 15network01
16network02 16network02
17 17
18# inner-compute is the groups of compute nodes which do not have 18[compute]
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]
29compute01 19compute01
30 20
31[compute:children]
32inner-compute
33external-compute
34
35[monitoring] 21[monitoring]
36monitoring01 22monitoring01
37 23
diff --git a/ansible/roles/neutron/tasks/precheck.yml b/ansible/roles/neutron/tasks/precheck.yml
index 190d0ed..850e6ec 100644
--- a/ansible/roles/neutron/tasks/precheck.yml
+++ b/ansible/roles/neutron/tasks/precheck.yml
@@ -48,16 +48,6 @@
48 run_once: true 48 run_once: true
49 with_items: "{{ tenant_network_types }}" 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- name: Checking whether Ironic enabled 51- name: Checking whether Ironic enabled
62 local_action: fail msg="Ironic must be enabled when using networking-baremetal/ironic-neutron-agent" 52 local_action: fail msg="Ironic must be enabled when using networking-baremetal/ironic-neutron-agent"
63 changed_when: false 53 changed_when: false
diff --git a/ansible/roles/neutron/templates/l3_agent.ini.j2 b/ansible/roles/neutron/templates/l3_agent.ini.j2
index 049f9c7..dd24e54 100644
--- a/ansible/roles/neutron/templates/l3_agent.ini.j2
+++ b/ansible/roles/neutron/templates/l3_agent.ini.j2
@@ -4,11 +4,7 @@
4{% if enable_neutron_dvr | bool %} 4{% if enable_neutron_dvr | bool %}
5{% if inventory_hostname in groups['network'] %} 5{% if inventory_hostname in groups['network'] %}
6agent_mode = dvr_snat 6agent_mode = dvr_snat
7{% elif inventory_hostname in groups['external-compute'] %} 7{% else %}
8agent_mode = dvr
9{% elif inventory_hostname in groups['inner-compute'] %}
10agent_mode = dvr_no_external
11{% elif inventory_hostname in groups['compute'] %}
12agent_mode = {{ neutron_compute_dvr_mode }} 8agent_mode = {{ neutron_compute_dvr_mode }}
13{% endif %} 9{% endif %}
14{% else %} 10{% else %}
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh
index a4c47e7..d7260a3 100644
--- a/contrib/dev/vagrant/bootstrap.sh
+++ b/contrib/dev/vagrant/bootstrap.sh
@@ -176,14 +176,14 @@ function configure_kolla_cli {
176 if [ "$MODE" == 'aio' ]; then 176 if [ "$MODE" == 'aio' ]; then
177 kolla-cli setdeploy local 177 kolla-cli setdeploy local
178 kolla-cli host add localhost 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 kolla-cli group addhost $group localhost 180 kolla-cli group addhost $group localhost
181 done 181 done
182 else 182 else
183 for node_num in $(seq 1 ${NUMBER_OF_COMPUTE_NODES}); do 183 for node_num in $(seq 1 ${NUMBER_OF_COMPUTE_NODES}); do
184 node_name="compute0${node_num}" 184 node_name="compute0${node_num}"
185 kolla-cli host add $node_name 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 done 187 done
188 188
189 for node_num in $(seq 1 ${NUMBER_OF_STORAGE_NODES}); do 189 for node_num in $(seq 1 ${NUMBER_OF_STORAGE_NODES}); do
diff --git a/releasenotes/notes/remove-deprecated-compute-groups-5273e945720edddc.yaml b/releasenotes/notes/remove-deprecated-compute-groups-5273e945720edddc.yaml
new file mode 100644
index 0000000..49fb60d
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-compute-groups-5273e945720edddc.yaml
@@ -0,0 +1,7 @@
1---
2upgrade:
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'.