From f6ed0d9f7cde85b749a40e1573195fed52a05997 Mon Sep 17 00:00:00 2001
From: shaofeng_cheng <chengsf@winhong.com>
Date: Thu, 18 May 2017 12:02:43 +0800
Subject: [PATCH] Fix invalid literal for int in swift_proxy_server

If enable swift and ceilometer.

Swift_proxy_server container start error

ValueError: invalid literal for int() with base 10: '5672driver = messagingv2'

Change-Id: Iff9135bfeece158de1c7159a51286cfe4da25ac4
Closes-Bug: #1691633
---
 ansible/roles/swift/templates/proxy-server.conf.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2
index 4f3942711..583320c53 100644
--- a/ansible/roles/swift/templates/proxy-server.conf.j2
+++ b/ansible/roles/swift/templates/proxy-server.conf.j2
@@ -55,6 +55,7 @@ operator_roles = admin,{{ keystone_default_user_role }}{% if enable_ceilometer |
 paste.filter_factory = ceilometermiddleware.swift:filter_factory
 control_exchange = swift
 url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
+
 driver = messagingv2
 topic = notifications
 log_level = WARN
-- 
GitLab