Skip to content
Snippets Groups Projects
Commit 0d03fc27 authored by Paul Bourke's avatar Paul Bourke Committed by Murali Annamneni
Browse files

Temporarily remove the rabbitmq clusterer plugin

In order to migrate to the latest release of rabbitmq (3.7), we need to
first remove this deprecated plugin which is no longer supported (the
problems it solved are now addressed in rabbitmq itself).

This avoids a circular dependency in CI where the new images depend on
the new clustering and the new clustering depends on the new images.

Change-Id: I921459f3e40b9e0d4af9497384e49aabf0abe79b
parent eb249b4f
No related branches found
No related tags found
No related merge requests found
......@@ -569,7 +569,6 @@ osprofiler_backend_connection_string: "{{ redis_connection_string if osprofiler_
rabbitmq_hipe_compile: "no"
rabbitmq_user: "openstack"
rabbitmq_monitoring_user: ""
rabbitmq_version: "rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x.ez/rabbitmq_clusterer-3.6.x-667f92b0/ebin"
outward_rabbitmq_user: "openstack"
####################
......
......@@ -41,7 +41,6 @@
with_items:
- "rabbitmq-env.conf"
- "rabbitmq.config"
- "rabbitmq-clusterer.config"
- "definitions.json"
notify:
- Restart rabbitmq container
......
......@@ -15,23 +15,6 @@
- include_tasks: config.yml
- name: Find gospel node
command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node
changed_when: gospel_node.stdout | from_json | changed
failed_when: gospel_node.stdout | from_json | failed
register: gospel_node
run_once: True
- name: Stopping non-gospel nodes
become: true
kolla_docker:
action: "stop_container"
common_options: "{{ docker_common_options }}"
name: "{{ project_name }}"
when:
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result']
- name: Flush handlers
meta: flush_handlers
when:
......
......@@ -5,7 +5,7 @@
{% endif %}
],
"users": [
{"name": "{{ role_rabbitmq_user }}", "password": "{{ role_rabbitmq_password }}", "tags": "administrator"}{% if role_rabbitmq_monitoring_user is defined and role_rabbitmq_monitoring_user %},
{"name": "{{ role_rabbitmq_user }}", "password": "password", "tags": "administrator"}{% if role_rabbitmq_monitoring_user is defined and role_rabbitmq_monitoring_user %},
{"name": "{{ role_rabbitmq_monitoring_user }}", "password": "{{ role_rabbitmq_monitoring_password }}", "tags": "monitoring"}{% endif %}{% if project_name == 'outward_rabbitmq' %},
{"name": "{{ murano_agent_rabbitmq_user }}", "password": "{{ murano_agent_rabbitmq_password }}", "tags": "management"}
{% endif %}
......
[
{version, 1},
{nodes, [
{% for host in groups[role_rabbitmq_groups] %}
{'rabbit@{{ hostvars[host]['ansible_hostname'] }}', disc}
{%- if not loop.last -%},{%- endif %}
{% endfor %}
]},
{gospel,
{node, 'rabbit@{{ hostvars[groups[role_rabbitmq_groups][0]]['ansible_hostname'] }}'}}
].
RABBITMQ_NODENAME=rabbit@{{ ansible_hostname }}
RABBITMQ_BOOT_MODULE=rabbit_clusterer
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/{{ rabbitmq_version }}"
RABBITMQ_LOG_BASE=/var/log/kolla/{{ project_name }}
# TODO(sdake, vhosakot)
......
......@@ -19,7 +19,6 @@
{port, {{ role_rabbitmq_management_port }}}
]},
{load_definitions, "/etc/rabbitmq/definitions.json"}
]},
{rabbitmq_clusterer, [{config, "/etc/rabbitmq/rabbitmq-clusterer.config"}]}
]}
].
% EOF
......@@ -13,12 +13,6 @@
"owner": "rabbitmq",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/rabbitmq-clusterer.config",
"dest": "/etc/rabbitmq/rabbitmq-clusterer.config",
"owner": "rabbitmq",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/definitions.json",
"dest": "/etc/rabbitmq/definitions.json",
......
......@@ -45,3 +45,6 @@ ceph_pool_pgp_num: 8
{% endif %}
keystone_token_provider: "fernet"
# TODO(pbourke): remove once https://review.openstack.org/#/c/584427/ is merged
rpc_transport_url: "rabbit://openstack:password@{{ api_interface_address }}:5672"
......@@ -149,7 +149,8 @@ function test_openstack {
tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks > /tmp/logs/ansible/prechecks1
# TODO(jeffrey4l): add pull action when we have a local registry
# service in CI
tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy > /tmp/logs/ansible/deploy
# TODO(pbourke): remove '-e rabbitmq_password=password' once https://review.openstack.org/#/c/584427/ is merged
tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy -e rabbitmq_password=password > /tmp/logs/ansible/deploy
tools/kolla-ansible -i ${RAW_INVENTORY} -vvv post-deploy > /tmp/logs/ansible/post-deploy
# Test OpenStack Environment
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment