Merge "Update the version of erlang to support rabbitmq"

This commit is contained in:
Zuul 2018-06-06 12:28:11 +00:00 committed by Gerrit Code Review
commit ea96b87de5
10 changed files with 44 additions and 16 deletions

View File

@ -72,6 +72,9 @@ rabbitmq_erlang_repo_url: "{{ _rabbitmq_erlang_repo_url }}"
# Set the repo information for the Erlang repository # Set the repo information for the Erlang repository
rabbitmq_erlang_repo: "{{ _rabbitmq_erlang_repo }}" rabbitmq_erlang_repo: "{{ _rabbitmq_erlang_repo }}"
# Set the elang version used on the deployment
rabbitmq_erlang_version_spec: "{{ _rabbitmq_erlang_version_spec | default(null) }}"
# Choose file, distro, external_repo for rabbitmq_install_method. # Choose file, distro, external_repo for rabbitmq_install_method.
rabbitmq_install_method: "{{ _rabbitmq_install_method }}" rabbitmq_install_method: "{{ _rabbitmq_install_method }}"

View File

@ -36,15 +36,4 @@ galaxy_info:
- rabbitmq - rabbitmq
- development - development
- openstack - openstack
dependencies: dependencies: []
- role: apt_package_pinning
apt_package_pinning_file_name: "rabbitmq.pref"
apt_package_pinning_priority: 999
apt_pinned_packages:
- package: "*"
release: "Erlang Solutions Ltd."
- package: "erlang*"
version: "1:19.3*"
priority: 1000
when:
- ansible_pkg_mgr == 'apt'

View File

@ -0,0 +1,9 @@
---
features:
- The option ``rabbitmq_erlang_version_spec`` has been added allowing
deployers to set the version of erlang used on a given installation.
deprecations:
- The use of the ``apt_package_pinning`` role as a meta dependency
has been removed from the rabbitmq_server role. While the package
pinning role is still used, it will now only be executed when the
apt task file is executed.

View File

@ -13,6 +13,20 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
- name: Run the apt package pinning role
include_role:
name: apt_package_pinning
private: true
vars:
apt_package_pinning_file_name: "rabbitmq.pref"
apt_package_pinning_priority: 999
apt_pinned_packages:
- package: "*"
release: "Erlang Solutions Ltd."
- package: "erlang*"
version: "{{ rabbitmq_erlang_version_spec }}"
priority: 1000
- block: - block:
- name: Add rabbitmq apt-keys - name: Add rabbitmq apt-keys
apt_key: apt_key:

View File

@ -113,8 +113,10 @@
when: when:
- item.pkg_spec not in yum_versionlock_list.stdout - item.pkg_spec not in yum_versionlock_list.stdout
with_items: with_items:
- { 'pkg_name': 'erlang', 'pkg_spec': "erlang-19*" } - pkg_name: 'erlang'
- { 'pkg_name': 'rabbitmq-server', 'pkg_spec': "rabbitmq-server-{{ rabbitmq_release_version }}*" } pkg_spec: "{{ rabbitmq_erlang_version_spec }}"
- pkg_name: 'rabbitmq-server'
pkg_spec: "rabbitmq-server-{{ rabbitmq_release_version }}*"
tags: tags:
- rabbitmq-yum-packages - rabbitmq-yum-packages

View File

@ -21,4 +21,4 @@
- name: previous_rabbitmq_server - name: previous_rabbitmq_server
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
scm: git scm: git
version: stable/pike version: stable/queens

View File

@ -0,0 +1,7 @@
rabbitmq_cookie_token: secrete
rabbitmq_ssl_cert: /etc/rabbitmq/rabbitmq.pem
rabbitmq_ssl_key: /etc/rabbitmq/rabbitmq.key
rabbitmq_hipe_compile: True
rabbitmq_erlang_version_spec: "{{ (ansible_pkg_mgr == 'apt') | ternary('1:19.3*','erlang-19*') }}"

View File

@ -106,7 +106,7 @@ deps =
{[testenv:ansible]deps} {[testenv:ansible]deps}
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
ANSIBLE_OVERRIDES={toxinidir}/tests/rabbitmq_server-overrides.yml ANSIBLE_OVERRIDES={toxinidir}/tests/rabbitmq_server-upgrade-overrides.yml
CLONE_UPGRADE_TESTS=yes CLONE_UPGRADE_TESTS=yes
commands = commands =
bash -c "{toxinidir}/tests/test-rabbitmq-upgrades.sh" bash -c "{toxinidir}/tests/test-rabbitmq-upgrades.sh"

View File

@ -42,6 +42,8 @@ _rabbitmq_erlang_repo:
state: "present" state: "present"
filename: els_erlang filename: els_erlang
_rabbitmq_erlang_version_spec: "1:20.1*"
rabbitmq_dependencies: rabbitmq_dependencies:
- erlang-base-hipe - erlang-base-hipe
- erlang-nox - erlang-nox

View File

@ -46,6 +46,8 @@ _rabbitmq_erlang_repo:
state: "present" state: "present"
filename: els-erlang filename: els-erlang
_rabbitmq_erlang_version_spec: "erlang-20.1*"
rabbitmq_distro_packages: rabbitmq_distro_packages:
- openssl - openssl
- rabbitmq-server - rabbitmq-server