From 80579966aa64935ad20d91be53e803fd6a5e6d8d Mon Sep 17 00:00:00 2001 From: ArchiFleKs Date: Mon, 20 Feb 2017 10:57:34 +0100 Subject: [PATCH] Make Magnum proto use openstack_service_proto Magnum default proto is hardcoded in http, this commit uses global openstack_service_proto variable like in the other os_role Change-Id: I5f3d3019639f30ab966195e5dc732f8f7959affd Closes-Bug: #1663274 --- playbooks/inventory/group_vars/all.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 099d3bc575..b7f2dcea33 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -468,3 +468,13 @@ fetch_directory: /etc/openstack_deploy/ceph-fetch/ # exists. we handle the log dir creation so this is not something we need # ceph-common to prepare for us. rbd_client_directories: false + +# Magnum +magnum_bind_port: 9511 +magnum_service_proto: http +magnum_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(magnum_service_proto) }}" +magnum_service_publicurl: "{{ magnum_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ magnum_bind_port }}" +magnum_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(magnum_service_proto) }}" +magnum_service_internalurl: "{{ magnum_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}" +magnum_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}" +magnum_service_adminurl: "{{ magnum_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"