From 08beb6fd6b5d33a3c55822d2afce8f2f95b06d07 Mon Sep 17 00:00:00 2001
From: Travis Truman <travis_truman@cable.comcast.com>
Date: Tue, 28 Jun 2016 11:59:29 -0400
Subject: [PATCH] glance_api_servers must contain a valid url with protocol

This addresses a Nova config deprecation in the Mitaka release
documented here: http://docs.openstack.org/releasenotes/nova/mitaka.html#deprecation-notes

Adding nova_glance_api_servers to the nova_all group vars to address
a nova role namespacing issue as well.

Needed-By: If33d3ce9e9dfee827a92c9c0813b7c0a18cb8a7b
Change-Id: Ibc0a5b70d4da2e905b10b4c1334b57a6f0f3b4ed
Closes-Bug: #1596084
---
 playbooks/inventory/group_vars/all.yml      | 12 +++++++++++-
 playbooks/inventory/group_vars/nova_all.yml |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index 17a54ffe36..dea87d3e14 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -120,7 +120,17 @@ cinder_rabbitmq_vhost: /cinder
 
 ## Glance
 glance_service_port: 9292
-glance_api_servers: "{{ internal_lb_vip_address }}:{{ glance_service_port }}"
+glance_service_proto: http
+glance_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(glance_service_proto) }}"
+glance_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(glance_service_proto) }}"
+glance_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(glance_service_proto) }}"
+glance_service_publicuri: "{{ glance_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ glance_service_port }}"
+glance_service_publicurl: "{{ glance_service_publicuri }}"
+glance_service_internaluri: "{{ glance_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
+glance_service_internalurl: "{{ glance_service_internaluri }}"
+glance_service_adminuri: "{{ glance_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
+glance_service_adminurl: "{{ glance_service_adminuri }}"
+glance_api_servers: "{{ glance_service_internaluri }}"
 glance_service_user_name: glance
 glance_rabbitmq_userid: glance
 glance_rabbitmq_vhost: /glance
diff --git a/playbooks/inventory/group_vars/nova_all.yml b/playbooks/inventory/group_vars/nova_all.yml
index 6787cafd75..6588f0c668 100644
--- a/playbooks/inventory/group_vars/nova_all.yml
+++ b/playbooks/inventory/group_vars/nova_all.yml
@@ -17,3 +17,4 @@ nova_external_ssl: "{{ openstack_external_ssl }}"
 nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
 nova_dhcp_domain: "{{ dhcp_domain }}"
 nova_service_in_ldap: "{{ service_ldap_backend_enabled }}"
+nova_glance_api_servers: "{{ glance_api_servers }}"