From c2fd1873e5e883ccdeec8a830217092056bcdc70 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Wed, 16 Nov 2016 11:03:25 +0000
Subject: [PATCH] Adjust urls with new 'address' functionality

* explisit scheme replaced with with_scheme flag
* ports provided to address function

Change-Id: I961bee5545e86dd4956a22106ca92bc0d0033bdf
---
 service/files/glance-api.conf.j2         | 6 +++---
 service/files/glance-registry.conf.j2    | 6 +++---
 service/files/glance-swift-store.conf.j2 | 2 +-
 service/glance-api.yaml                  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index 2208741..9adee22 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -22,15 +22,15 @@ connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{
 max_retries = -1
 
 [keystone_authtoken]
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
-auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
+auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = {{ openstack.project_name }}
 username = {{ glance.user }}
 password = {{ glance.password }}
-memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
+memcached_servers = {{ address('memcached', memcached.port) }}
 
 
 [paste_deploy]
diff --git a/service/files/glance-registry.conf.j2 b/service/files/glance-registry.conf.j2
index ef7e83f..6223da3 100644
--- a/service/files/glance-registry.conf.j2
+++ b/service/files/glance-registry.conf.j2
@@ -19,15 +19,15 @@ connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{
 max_retries = -1
 
 [keystone_authtoken]
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
-auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
+auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
 username = {{ glance.user }}
 password = {{ glance.password }}
-memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
+memcached_servers = {{ address('memcached', memcached.port) }}
 
 [paste_deploy]
 flavor = keystone
diff --git a/service/files/glance-swift-store.conf.j2 b/service/files/glance-swift-store.conf.j2
index df3dedc..a50fd52 100644
--- a/service/files/glance-swift-store.conf.j2
+++ b/service/files/glance-swift-store.conf.j2
@@ -1,6 +1,6 @@
 [swift]
 auth_version = 3
-auth_address = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
+auth_address = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
 user = {{ openstack.project_name }}:{{ glance.user }}
 key = {{ glance.password }}
 project_domain_id = default
diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index 9634d4a..8769def 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -50,12 +50,12 @@ service:
           dependencies:
             - glance-service-create
           type: single
-          command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
+          command: openstack endpoint create --region RegionOne image internal {{ address('glance-api', glance.api_port, with_scheme=True) }}
         - name: glance-admin-endpoint-create
           dependencies:
             - glance-service-create
           type: single
-          command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
+          command: openstack endpoint create --region RegionOne image admin {{ address('glance-api', glance.api_port, with_scheme=True) }}
       daemon:
         files:
           - glance-api