aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-03-13 22:47:35 +0000
committerSam Yaple <sam@yaple.net>2016-03-14 15:52:48 +0000
commit8b3f0d085712154d580e4a464ca7e88e612f2fb2 (patch)
tree83d9fae3ea95c00333ffbf6252aad87329ee81e7 /ansible
parent9500bd239ac122ae41de6086112e5e5335ed1558 (diff)
downloadkolla-8b3f0d085712154d580e4a464ca7e88e612f2fb2.tar.gz
kolla-8b3f0d085712154d580e4a464ca7e88e612f2fb2.zip
Use ubuntu Mitaka repo
The rabbitmq-server package is upgraded to 3.5.7 in cloud-archive so we update centos to match The xen-utils package now needs an explict version, xen-utils-4.6 is what is provided by cloud-archive mitaka Libvirt 1.3 is in the ubuntu cloud-archive. This has a new daemon for logging that needs further implementation in newton. For now, it has been disabled within the qemu.conf Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net> TrivialFix Change-Id: I84217824817c484b6800a64cbd7767b127a3098e
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j26
1 files changed, 2 insertions, 4 deletions
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
index 837b9a0ca..d533b7b91 100644
--- a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
@@ -2,13 +2,11 @@ RABBITMQ_NODENAME=rabbit
RABBITMQ_BOOT_MODULE=rabbit_clusterer
RABBITMQ_LOG_BASE=/var/log/kolla/rabbitmq
+RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.7/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
-{% if not kolla_base_distro in ['ubuntu', 'debian'] %}
-RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.5/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
+{% if kolla_base_distro not in ['ubuntu', 'debian'] %}
# See bug https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1374109
export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
-{% else %}
-RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.4/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin"
{% endif %}
export ERL_EPMD_PORT={{ rabbitmq_epmd_port }}