diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index e7450fa23c..b41951da43 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,7 +1,7 @@ - name: ansible-hardening scm: git src: https://git.openstack.org/openstack/ansible-hardening - version: 0fdf77a65a940b19f2f2d57b8d6fe457c5754aa3 + version: 9a9b31f629ec33b2f78dc361824d49beb070b0af - name: apt_package_pinning scm: git src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning @@ -9,7 +9,7 @@ - name: pip_install scm: git src: https://git.openstack.org/openstack/openstack-ansible-pip_install - version: 38f897dbe88a3549a57a6c9a6e6a2221250cf2e5 + version: ac54eeae6fe04174508aa54632c2566c2df4a66a - name: galera_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_client @@ -25,7 +25,7 @@ - name: haproxy_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server - version: 43d4290787c2ee600346182c9cda8ccc77d5e4c6 + version: 61a5fe0bbbffb989211324d8f4747582680839ad - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived @@ -37,7 +37,7 @@ - name: lxc_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts - version: 80835e9f1aaca71c9a1e4a31d5078ace94eced40 + version: e036bc58c28febd625ceb26eb3c061b289219ede - name: memcached_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-memcached_server @@ -65,7 +65,7 @@ - name: os_ceilometer scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer - version: 4365cee7f0222440fa96ef4ad7162f1109d1ee58 + version: 31a9b519cd9a9ef64987f221ee271e9ae1a77111 - name: os_cinder scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_cinder @@ -101,7 +101,7 @@ - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: ba76d8fff03533eac7d41ed687d0beeedf93ab02 + version: 5fe139052aa79e283f412c9d059cdc34721a181c - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova @@ -121,7 +121,7 @@ - name: os_tempest scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_tempest - version: 33175a6d5d563c42031e95796a75cb7c1b2ff23b + version: 4072a9e9a33fb06a9b2fe4331bda533ae3d35687 - name: plugins scm: git src: https://git.openstack.org/openstack/openstack-ansible-plugins diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index efe91a9983..f5f79405fd 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -10,7 +10,7 @@ ### These pins are updated through the sources-branch-updater script ### ### pip==9.0.1 -setuptools==33.1.1 -wheel==0.29.0 +setuptools==38.4.0 +wheel==0.30.0 # TODO(evrardjp): Remove this when a fixed version of shade is delivered shade===1.22.2 diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 634c6f8549..ab0106dff5 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,134 +31,134 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 7feff7eae1c2ad6fca1eb78e4c0c80acc0d9ba39 # HEAD of "stable/ocata" as of 09.12.2017 +requirements_git_install_branch: 7841bd5f4229128be1701ff2423e2743a3ebb34e # HEAD of "stable/ocata" as of 08.01.2018 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: 4a55fca24599e94491a52bd1d6d990c88c2583bf # HEAD of "stable/ocata" as of 09.12.2017 +aodh_git_install_branch: c77c0aac4db000dbd8bee2b68080773deaf90071 # HEAD of "stable/ocata" as of 08.01.2018 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}" aodh_git_project_group: aodh_all ## Barbican service barbican_git_repo: https://git.openstack.org/openstack/barbican -barbican_git_install_branch: 5198ab90caced50e1e25aad0e9ffaa0bbe6050c6 # HEAD of "stable/ocata" as of 09.12.2017 +barbican_git_install_branch: 5198ab90caced50e1e25aad0e9ffaa0bbe6050c6 # HEAD of "stable/ocata" as of 08.01.2018 barbican_git_dest: "/opt/barbican_{{ barbican_git_install_branch | replace('/', '_') }}" barbican_git_project_group: barbican_all ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 1fc3e4662dabb54967ce0277c6feb93a985087b3 # HEAD of "stable/ocata" as of 09.12.2017 +ceilometer_git_install_branch: 24e72132e76d38c93875757c7a56d6c651741391 # HEAD of "stable/ocata" as of 08.01.2018 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ceilometer_git_project_group: ceilometer_all ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 23377ac9a84f57c463653efc4b90f789d6f5cf3d # HEAD of "stable/ocata" as of 09.12.2017 +cinder_git_install_branch: dd727943d060e9e32ad7a4390337560b8ced1529 # HEAD of "stable/ocata" as of 08.01.2018 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" cinder_git_project_group: cinder_all ## Designate service designate_git_repo: https://git.openstack.org/openstack/designate -designate_git_install_branch: b0b2878b3c356d057f9e2468d55dc0cd8f42ec42 # HEAD of "stable/ocata" as of 09.12.2017 +designate_git_install_branch: fd058c4438d9e0955586443f782e4925fe7448c5 # HEAD of "stable/ocata" as of 08.01.2018 designate_git_dest: "/opt/designate_{{ designate_git_install_branch | replace('/', '_') }}" designate_git_project_group: designate_all ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 02819244c054577656ac4db745b7bf6f47c26b9d # HEAD of "stable/ocata" as of 09.12.2017 +designate_dashboard_git_install_branch: 02819244c054577656ac4db745b7bf6f47c26b9d # HEAD of "stable/ocata" as of 08.01.2018 designate_dashboard_git_dest: "/opt/designate_dashboard_{{ designate_dashboard_git_install_branch | replace('/', '_') }}" designate_dashboard_git_project_group: horizon_all ## Dragonflow service dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow -dragonflow_git_install_branch: b72ffa06721faf95f42c9702f60a9acc3a7d8b61 # HEAD of "stable/ocata" as of 09.12.2017 +dragonflow_git_install_branch: b72ffa06721faf95f42c9702f60a9acc3a7d8b61 # HEAD of "stable/ocata" as of 08.01.2018 dragonflow_git_dest: "/opt/dragonflow_{{ dragonflow_git_install_branch | replace('/', '_') }}" dragonflow_git_project_group: neutron_all ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: d9ca87d9f7bea3a7cfaec712b3535463704d75f7 # HEAD of "stable/ocata" as of 09.12.2017 +glance_git_install_branch: d9ca87d9f7bea3a7cfaec712b3535463704d75f7 # HEAD of "stable/ocata" as of 08.01.2018 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" glance_git_project_group: glance_all ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 76da5a4a2fb0f7315d1d8a3d003f6ab0e4de0c07 # HEAD of "stable/ocata" as of 09.12.2017 +heat_git_install_branch: 76da5a4a2fb0f7315d1d8a3d003f6ab0e4de0c07 # HEAD of "stable/ocata" as of 08.01.2018 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" heat_git_project_group: heat_all ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: b0bc83b807eb21e05e6ea203edaa37940674e0a4 # HEAD of "stable/ocata" as of 09.12.2017 +horizon_git_install_branch: b0bc83b807eb21e05e6ea203edaa37940674e0a4 # HEAD of "stable/ocata" as of 08.01.2018 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" horizon_git_project_group: horizon_all ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: e52f4c15cbcfd271cd81ac2e0f88cd6e52648d78 # HEAD of "stable/ocata" as of 09.12.2017 +ironic_dashboard_git_install_branch: 6c70c8ef6b104e121db0311aa035affc3680a00f # HEAD of "stable/ocata" as of 08.01.2018 ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}" ironic_dashboard_git_project_group: horizon_all ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: 4caadd6eb47b4778c9166ab66018ae33dc1de242 # HEAD of "stable/ocata" as of 09.12.2017 +magnum_dashboard_git_install_branch: 4caadd6eb47b4778c9166ab66018ae33dc1de242 # HEAD of "stable/ocata" as of 08.01.2018 magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}" magnum_dashboard_git_project_group: horizon_all ## Horizon LBaaS dashboard plugin neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard -neutron_lbaas_dashboard_git_install_branch: 834ea9dd7aeaefed397d6d510b7527ce0fa5bd33 # HEAD of "stable/ocata" as of 09.12.2017 +neutron_lbaas_dashboard_git_install_branch: 834ea9dd7aeaefed397d6d510b7527ce0fa5bd33 # HEAD of "stable/ocata" as of 08.01.2018 neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}" neutron_lbaas_dashboard_git_project_group: horizon_all ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: 19bfe33d24f9ac9555621d14fad3538c5966c14c # HEAD of "stable/ocata" as of 09.12.2017 +sahara_dashboard_git_install_branch: 19bfe33d24f9ac9555621d14fad3538c5966c14c # HEAD of "stable/ocata" as of 08.01.2018 sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}" sahara_dashboard_git_project_group: horizon_all ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: e1a94f39edb6cf777c71c7a511476b1e60436ab9 # HEAD of "stable/ocata" as of 09.12.2017 +keystone_git_install_branch: e1a94f39edb6cf777c71c7a511476b1e60436ab9 # HEAD of "stable/ocata" as of 08.01.2018 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" keystone_git_project_group: keystone_all ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 7bcaf138b25ad63b175ece79297244bfc376e3b6 # HEAD of "stable/ocata" as of 09.12.2017 +neutron_git_install_branch: 295c70035612e90e64dcf4238fb52195252fa814 # HEAD of "stable/ocata" as of 08.01.2018 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_git_project_group: neutron_all neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: 308c1144a812b9d247b337432da42ff2e33a0a39 # HEAD of "stable/ocata" as of 09.12.2017 +neutron_lbaas_git_install_branch: 10771afe4f97fcd6b12c8ca0c3ed8d029186dd9b # HEAD of "stable/ocata" as of 08.01.2018 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_project_group: neutron_all neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: c86cda8a40a4189adc7473dd8d2ee4caeee8e1dc # HEAD of "stable/ocata" as of 09.12.2017 +neutron_vpnaas_git_install_branch: c86cda8a40a4189adc7473dd8d2ee4caeee8e1dc # HEAD of "stable/ocata" as of 08.01.2018 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_project_group: neutron_all neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 1f76429d87327e1d1d70a7a0211098c76f9f4688 # HEAD of "stable/ocata" as of 09.12.2017 +neutron_fwaas_git_install_branch: 1f76429d87327e1d1d70a7a0211098c76f9f4688 # HEAD of "stable/ocata" as of 08.01.2018 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_project_group: neutron_all neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: 4b6afd41961743353400f78ddcbc4a5d34665468 # HEAD of "stable/ocata" as of 09.12.2017 +neutron_dynamic_routing_git_install_branch: 4b6afd41961743353400f78ddcbc4a5d34665468 # HEAD of "stable/ocata" as of 08.01.2018 neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}" neutron_dynamic_routing_git_project_group: neutron_all @@ -168,35 +168,35 @@ networking_calico_git_project_group: neutron_all ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: bbfc4230efe3299fa51f9451f54062f32590ed3d # HEAD of "stable/ocata" as of 09.12.2017 +nova_git_install_branch: ff2231f58389fc1a1f7c7b6fbf66ff0602a5cbfc # HEAD of "stable/ocata" as of 08.01.2018 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" nova_git_project_group: nova_all ## PowerVM Virt Driver nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm -nova_powervm_git_install_branch: a7df8c69b1a3cafbcbccd2a0010b1d21351ba01b # HEAD of "stable/ocata" as of 09.12.2017 +nova_powervm_git_install_branch: a7df8c69b1a3cafbcbccd2a0010b1d21351ba01b # HEAD of "stable/ocata" as of 08.01.2018 nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}" nova_powervm_git_project_group: nova_all ## LXD Virt Driver nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd -nova_lxd_git_install_branch: 2a452c54ea6cf525e2ef9ff1e29776d2ab618311 # HEAD of "stable/ocata" as of 09.12.2017 +nova_lxd_git_install_branch: 2a452c54ea6cf525e2ef9ff1e29776d2ab618311 # HEAD of "stable/ocata" as of 08.01.2018 nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}" nova_lxd_git_project_group: nova_all ## Sahara service sahara_git_repo: https://git.openstack.org/openstack/sahara -sahara_git_install_branch: a2843e8a54465be9c7a5b58e36c854e6b3ad090a # HEAD of "stable/ocata" as of 09.12.2017 +sahara_git_install_branch: a2843e8a54465be9c7a5b58e36c854e6b3ad090a # HEAD of "stable/ocata" as of 08.01.2018 sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}" sahara_git_project_group: sahara_all ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 6d69a7f6774e4bc52676f309dcd640309d99e0e9 # HEAD of "stable/ocata" as of 09.12.2017 +swift_git_install_branch: 6d69a7f6774e4bc52676f309dcd640309d99e0e9 # HEAD of "stable/ocata" as of 08.01.2018 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" swift_git_project_group: swift_all @@ -209,24 +209,24 @@ swift_swift3_git_project_group: swift_all ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: 713845d64ab63592f455cb2657225e27a662d4a0 # HEAD of "stable/ocata" as of 09.12.2017 +ironic_git_install_branch: 7eaa7e5e1133290b8fdbde51fbdacd8383f92141 # HEAD of "stable/ocata" as of 08.01.2018 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}" ironic_git_project_group: ironic_all ## Magnum service magnum_git_repo: https://git.openstack.org/openstack/magnum -magnum_git_install_branch: f5cd4321bf436e7b131d81e1b8150acdbeb49e2b # HEAD of "stable/ocata" as of 09.12.2017 +magnum_git_install_branch: f5cd4321bf436e7b131d81e1b8150acdbeb49e2b # HEAD of "stable/ocata" as of 08.01.2018 magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}" magnum_git_project_group: magnum_all ## Trove service trove_git_repo: https://git.openstack.org/openstack/trove -trove_git_install_branch: 898d364fdf2cb6faad9735cdd01cba16b67f19b7 # HEAD of "stable/ocata" as of 09.12.2017 +trove_git_install_branch: 898d364fdf2cb6faad9735cdd01cba16b67f19b7 # HEAD of "stable/ocata" as of 08.01.2018 trove_git_dest: "/opt/trove_{{ trove_git_install_branch | replace('/', '_') }}" trove_git_project_group: trove_all ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: e88344200a0b3e03f644a98723ff5fa1b670df7a # HEAD of "stable/ocata" as of 09.12.2017 +trove_dashboard_git_install_branch: e88344200a0b3e03f644a98723ff5fa1b670df7a # HEAD of "stable/ocata" as of 08.01.2018 trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}" trove_dashboard_git_project_group: horizon_all diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 4178c8b05b..b76d08722e 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -53,8 +53,8 @@ repo_release_path: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }} # These pins are updated through the sources-branch-updater script pip_packages: - pip==9.0.1 - - setuptools==33.1.1 - - wheel==0.29.0 + - setuptools==38.4.0 + - wheel==0.30.0 pip_links: - { name: "openstack_release", link: "{{ repo_release_path }}/" } diff --git a/releasenotes/notes/clustecheck-9311d05fb32f13b3.yaml b/releasenotes/notes/clustecheck-9311d05fb32f13b3.yaml new file mode 100644 index 0000000000..f40f9799dd --- /dev/null +++ b/releasenotes/notes/clustecheck-9311d05fb32f13b3.yaml @@ -0,0 +1,7 @@ +--- +features: + - The galera cluster now supports cluster health checks over HTTP using port + 9200. The new cluster check ensures a node is healthy by running a simple + query against the wsrep sync status using monitoring user. This change will + provide for a more robust cluster check ensuring we have the most fault + tolerant galera cluster possible. diff --git a/releasenotes/notes/new_healthcheck-9e559565745defd0.yaml b/releasenotes/notes/new_healthcheck-9e559565745defd0.yaml new file mode 100644 index 0000000000..8707d2979e --- /dev/null +++ b/releasenotes/notes/new_healthcheck-9e559565745defd0.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Galera healthcheck has been improved, and relies on an xinetd service. + By default, the service is unaccessible (filtered with the no_access + directive). You can override the directive by setting any xinetd + valid value to ``galera_monitoring_allowed_source``. diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 93db4560a5..1b68f4df28 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -20,7 +20,7 @@ LINE='----------------------------------------------------------------------' MAX_RETRIES=${MAX_RETRIES:-5} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:--e gather_facts=False} STARTTIME="${STARTTIME:-$(date +%s)}" -PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==33.1.1 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==38.4.0 wheel==0.30.0 '} COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"} # The default SSHD configuration has MaxSessions = 10. If a deployer changes