Implement rolling upgrades for neutron

Based on [1], this patch implements changes to the playbook which executes the neutron deployment in a play per host group, serialised to ensure that: 1. The services are changed in the right order. 2. The API services remain available at all times during an upgrade (except when doing a db contract). 3. If services are sharing a host/container then the role execution will not execute twice on the same host. [1] https://docs.openstack.org/developer/neutron/devref/upgrade.html Depends-On: I368b51ef37763f4163ead591d6743c4d56962ef9 Depends-On: I7dfef45e1ed8a8dfa464f1b3d20c90ae3348ce2e Change-Id: Ib9067042066e9b5b2cd7418ea7f7f96225302852 (cherry picked from commit 14793d701d)
2017-06-20 16:02:43 +01:00 · 2017-06-20 16:02:43 +01:00 · 3cebcf10e3
parent 255c626e9a
commit 3cebcf10e3
4 changed files with 172 additions and 106 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -101,7 +101,7 @@
 - name: os_neutron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: 6e6d458c63d22b153a00cddd17a1a1f407da33d5
+  version: b6abac13ea2c9610ff92a0008ff2062e6dfde42b
 - name: os_nova
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
--- a/playbooks/common-playbooks/neutron.yml
+++ b/playbooks/common-playbooks/neutron.yml
@ -0,0 +1,120 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Install neutron services
+  hosts: "{{ neutron_hosts }}"
+  serial: "{{ neutron_serial }}"
+  gather_facts: "{{ gather_facts | default(True) }}"
+  user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - neutron
+  pre_tasks:
+
+    - name: Determine tunnel bridge IP address
+      include: ../common-tasks/dynamic-address-fact.yml
+      vars:
+        network_address: "tunnel_address"
+
+    - name: Configure container (neutron-agent)
+      include: ../common-tasks/os-lxc-container-setup.yml
+      vars:
+        aa_profile: "unconfined"
+        list_of_bind_mounts:
+          - bind_dir_path: "{{ (ansible_pkg_mgr == 'apt') | ternary('/lib/modules', '/usr/lib/modules') }}"
+            mount_path: "{{ (ansible_pkg_mgr == 'apt') | ternary('/lib/modules', '/usr/lib/modules') }}"
+        extra_container_config:
+          - "lxc.cgroup.devices.allow=a *:* rmw"
+        extra_container_config_no_restart:
+          - "lxc.start.order=79"
+      when:
+        - "'neutron_agent' in group_names"
+
+    - name: Configure container (other services)
+      include: ../common-tasks/os-lxc-container-setup.yml
+      when:
+        - "'neutron_agent' not in group_names"
+
+    - name: Configure log directories (on metal)
+      include: ../common-tasks/os-log-dir-setup.yml
+      vars:
+        log_dirs:
+          - src: "/openstack/log/{{ inventory_hostname }}-neutron"
+            dest: "/var/log/neutron"
+
+    - name: Configure log directories (on metal) (calico)
+      include: ../common-tasks/os-log-dir-setup.yml
+      vars:
+        log_dirs:
+          - src: "/openstack/log/{{ inventory_hostname }}-calico"
+            dest: "/var/log/calico"
+      when:
+        - "'neutron_calico_dhcp_agent' in group_names"
+
+    - name: Configure package proxy cache
+      include: ../common-tasks/package-cache-proxy.yml
+
+    - name: Create the neutron provider networks facts
+      provider_networks:
+        provider_networks: "{{ provider_networks }}"
+        bind_prefix: "{{ provider_network_bind_prefix | default('') }}"
+        is_metal: "{{ is_metal }}"
+      register: pndata
+      tags:
+        - always
+
+    - name: Set provider network fact(s)
+      set_fact:
+        _provider_networks: "{{ pndata }}"
+      tags:
+        - always
+
+  roles:
+    - role: "os_neutron"
+      neutron_overlay_network: "{{ _overlay_network }}"
+      neutron_provider_networks: "{{ _provider_networks }}"
+      neutron_local_ip: "{{ tunnel_address }}"
+
+    - role: "bird"
+      when:
+        - "'neutron_calico_dhcp_agent' in group_names"
+      tags:
+        - bird
+
+    - role: "openstack_openrc"
+      tags:
+        - openrc
+
+    - role: "rsyslog_client"
+      rsyslog_client_log_rotate_file: neutron_log_rotate
+      rsyslog_client_log_dir: "/var/log/neutron"
+      rsyslog_client_config_name: "99-neutron-rsyslog-client.conf"
+      rsyslog_client_log_files:
+        - /var/log/conntrackd.log
+        - /var/log/conntrackd-stats.log
+      tags:
+        - rsyslog
+
+    - role: "rsyslog_client"
+      rsyslog_client_log_rotate_file: calico_log_rotate
+      rsyslog_client_log_dir: "/var/log/calico"
+      rsyslog_client_config_name: "99-calico-rsyslog-client.conf"
+      when: "'neutron_calico_dhcp_agent' in group_names"
+      tags:
+        - rsyslog
+
+    - role: "system_crontab_coordination"
+      tags:
+        - crontab
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@ -16,64 +16,41 @@
 - name: Configure Neutron dynamic host groupings
  hosts: localhost
  gather_facts: no
+  tags:
+    - neutron
  tasks:
    - include: common-tasks/dynamic-grouping.yml
      vars:
        src_group: "nova_compute"
        dest_group: "neutron_l3_agent, neutron_metadata_agent"
      when:
-        - "{{ neutron_plugin_type == 'ml2.ovs.dvr' }}"
+        - "neutron_plugin_type == 'ml2.ovs.dvr'"

- name: Installation and setup of Neutron
+
+
+- name: Prepare MQ/DB services
  hosts: neutron_all
  gather_facts: "{{ gather_facts | default(True) }}"
  max_fail_percentage: 20
  user: root
-  pre_tasks:
-    - include: common-tasks/dynamic-address-fact.yml
-      vars:
-        network_address: "tunnel_address"
-    - include: common-tasks/os-lxc-container-setup.yml
-      # This config is specific to Ubuntu
-      vars:
-        aa_profile: "unconfined"
-        list_of_bind_mounts:
-          - bind_dir_path: "/lib/modules"
-            mount_path: "/lib/modules"
-        extra_container_config:
-          - "lxc.cgroup.devices.allow=a *:* rmw"
-        extra_container_config_no_restart:
-          - "lxc.start.order=79"
-      when:
-        - inventory_hostname in groups['neutron_agent']
-        - ansible_pkg_mgr == 'apt'
-    - include: common-tasks/os-lxc-container-setup.yml
-      # This config is specific to CentOS.
-      vars:
-        aa_profile: "unconfined"
-        list_of_bind_mounts:
-          - bind_dir_path: "/usr/lib/modules"
-            mount_path: "/usr/lib/modules"
-        extra_container_config:
-          - "lxc.cgroup.devices.allow=a *:* rmw"
-      when:
-        - inventory_hostname in groups['neutron_agent']
-        - ansible_pkg_mgr == 'yum'
-    - include: common-tasks/os-lxc-container-setup.yml
-      static: no
-      when: inventory_hostname not in groups['neutron_agent']
-    - include: common-tasks/rabbitmq-vhost-user.yml
-      static: no
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - neutron
+  tasks:
+
+    - name: Configure rabbitmq vhost/user
+      include: common-tasks/rabbitmq-vhost-user.yml
      vars:
        user: "{{ neutron_rabbitmq_userid }}"
        password: "{{ neutron_rabbitmq_password }}"
        vhost: "{{ neutron_rabbitmq_vhost }}"
        _rabbitmq_host_group: "{{ neutron_rabbitmq_host_group }}"
      when:
-        - inventory_hostname == groups['neutron_all'][0]
        - groups[neutron_rabbitmq_host_group] | length > 0
-    - include: common-tasks/rabbitmq-vhost-user.yml
-      static: no
+      run_once: yes
+
+    - name: Configure rabbitmq vhost/user (telemetry)
+      include: common-tasks/rabbitmq-vhost-user.yml
      vars:
        user: "{{ neutron_rabbitmq_telemetry_userid }}"
        password: "{{ neutron_rabbitmq_telemetry_password }}"
@ -81,79 +58,41 @@
        _rabbitmq_host_group: "{{ neutron_rabbitmq_telemetry_host_group }}"
      when:
        - neutron_ceilometer_enabled | bool
-        - inventory_hostname == groups['neutron_all'][0]
        - groups[neutron_rabbitmq_telemetry_host_group] is defined
        - groups[neutron_rabbitmq_telemetry_host_group] | length > 0
        - groups[neutron_rabbitmq_telemetry_host_group] != groups[neutron_rabbitmq_host_group]
-    - include: common-tasks/os-log-dir-setup.yml
-      vars:
-        log_dirs:
-          - src: "/openstack/log/{{ inventory_hostname }}-neutron"
-            dest: "/var/log/neutron"
-    - include: common-tasks/os-log-dir-setup.yml
-      vars:
-        log_dirs:
-          - src: "/openstack/log/{{ inventory_hostname }}-calico"
-            dest: "/var/log/calico"
-      when: "{{ 'neutron_calico_dhcp_agent' in group_names }}"
-    - include: common-tasks/mysql-db-user.yml
+      run_once: yes
+
+    - name: Configure MySQL user
+      include: common-tasks/mysql-db-user.yml
      static: no
      vars:
        user_name: "{{ neutron_galera_user }}"
        password: "{{ neutron_container_mysql_password }}"
        login_host: "{{ neutron_galera_address }}"
        db_name: "{{ neutron_galera_database }}"
-      when: inventory_hostname == groups['neutron_all'][0]
-    - include: common-tasks/package-cache-proxy.yml
+      run_once: yes

-    - name: Create the neutron provider networks facts
-      provider_networks:
-        provider_networks: "{{ provider_networks }}"
-        bind_prefix: "{{ bind_prefix }}"
-        is_metal: "{{ is_metal }}"
-      register: pndata
-      tags:
-        - always
-    - name: Set provider network fact(s)
-      set_fact:
-        _provider_networks: "{{ pndata }}"
-      tags:
-        - always
-  roles:
-    - role: "os_neutron"
-      neutron_overlay_network: "{{ _overlay_network }}"
-      neutron_provider_networks: "{{ _provider_networks }}"
-      neutron_local_ip: "{{ tunnel_address }}"
-    - role: "bird"
-      when:
-        - "'neutron_calico_dhcp_agent' in group_names"
-      tags:
-        - bird
-    - role: "openstack_openrc"
-      tags:
-        - openrc
-    - role: "rsyslog_client"
-      rsyslog_client_log_rotate_file: neutron_log_rotate
-      rsyslog_client_log_dir: "/var/log/neutron"
-      rsyslog_client_config_name: "99-neutron-rsyslog-client.conf"
-      rsyslog_client_log_files:
-        - /var/log/conntrackd.log
-        - /var/log/conntrackd-stats.log
-      tags:
-        - rsyslog
-    - role: "rsyslog_client"
-      rsyslog_client_log_rotate_file: calico_log_rotate
-      rsyslog_client_log_dir: "/var/log/calico"
-      rsyslog_client_config_name: "99-calico-rsyslog-client.conf"
-      when: "{{ 'neutron_calico_dhcp_agent' in group_names }}"
-      tags:
-        - rsyslog
-    - role: "system_crontab_coordination"
-      tags:
-        - crontab
+
+
+- name: Install neutron server
+  include: common-playbooks/neutron.yml
  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
-    bind_prefix: "{{ provider_network_bind_prefix|default('') }}"
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - neutron
+    neutron_hosts: "neutron_server"
+    neutron_serial: "{{ neutron_server_serial | default('100%') }}"
+
+
+
+- name: Install neutron L2 agents
+  include: common-playbooks/neutron.yml
+  vars:
+    neutron_hosts: "neutron_linuxbridge_agent:neutron_openvswitch_agent:!neutron_server"
+    neutron_serial: "{{ neutron_agent_serial | default('20%') }}"
+
+
+
+- name: Install all other neutron agents
+  include: common-playbooks/neutron.yml
+  vars:
+    neutron_hosts: "neutron_all:!neutron_linuxbridge_agent:!neutron_openvswitch_agent:!neutron_server"
+    neutron_serial: "{{ neutron_other_serial | default('1') }}"
--- a/releasenotes/notes/neutron-rolling-upgrades-5269b62ea216df5e.yaml
+++ b/releasenotes/notes/neutron-rolling-upgrades-5269b62ea216df5e.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - |
+    The ``os-neutron-install.yml`` playbook will now execute a rolling
+    upgrade of neutron including database migrations (both expand and
+    contract) as per the procedure described in the
+    `neutron documentation <https://docs.openstack.org/developer/neutron/devref/upgrade.html>`_.