From 9a3f38a7dfa4664227d642b4db74c42a3a690d2d Mon Sep 17 00:00:00 2001
From: Ryan Moore <ryan.moore@hp.com>
Date: Thu, 3 Apr 2014 16:37:54 +0100
Subject: [PATCH] Set glance protocol and port as Heat configurable

This change is to set the glance protocol and port as
configurable via the Heat template. Presently the port is
hard-coded in the elements nova.conf file, and the protocol
is assumed as being the default (http).

This change will allow the glance_api_servers
to be set (in nova.conf) using the constituent parts:
    glance_protocol://glance_host:glance_port

Change to nova.conf to read this value is:
    Idccc0d60c9f6b17a853c6de1bbea64bfc7e028b2

Default port value is set to the nova default(9292) which is
currently hard-coded in the elements nova.conf file.
Default protocol value is set to the nova default(http).

Change-Id: I3c7218292797c62c36e2aaab4f325bf053ef140b
---
 nova-compute-instance.yaml | 10 ++++++++++
 overcloud-source.yaml      | 12 ++++++++++++
 undercloud-source.yaml     | 12 ++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index a93eda03..d32159a3 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -123,6 +123,14 @@ Parameters:
     NoEcho: true
   GlanceHost:
     Type: String
+  GlancePort:
+    Default: 9292
+    Description: Glance port.
+    Type: String
+  GlanceProtocol:
+    Default: http
+    Description: Protocol to use when connecting to glance, set to https for SSL.
+    Type: String
   CeilometerDSN:
     Type: String
   NovaDSN:
@@ -192,6 +200,8 @@ Resources:
         snmpd_readonly_user_name: {Ref: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {Ref: SnmpdReadonlyUserPassword}
         glance_host: {Ref: GlanceHost}
+        glance_port: {Ref: GlancePort}
+        glance_protocol: {Ref: GlanceProtocol}
         static_hosts: {Ref: StaticHosts}
         keystone_host: {Ref: KeystoneHost}
         neutron_flat_networks: {Ref: NeutronFlatNetworks}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 7ecb92ce..413bfbac 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -71,6 +71,14 @@ Parameters:
     Default: baremetal
     Description: Flavor for compute nodes to request when deploying.
     Type: String
+  GlancePort:
+    Default: 9292
+    Description: Glance port.
+    Type: String
+  GlanceProtocol:
+    Default: http
+    Description: Protocol to use when connecting to glance, set to https for SSL.
+    Type: String
   GlancePassword:
     Default: unset
     Description: The password for the glance service account, used by the glance services.
@@ -415,6 +423,10 @@ Resources:
           db: mysql://glance:unset@localhost/glance
           host:
             get_input: controller_host
+          port:
+            Ref: GlancePort
+          protocol:
+            Ref: GlanceProtocol
           service-password:
             Ref: GlancePassword
           swift-store-user: service:glance
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 7206c67c..018cbf51 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -80,6 +80,14 @@ Parameters:
     Default: baremetal
     Description: Flavor to request when deploying.
     Type: String
+  GlancePort:
+   Default: 9292
+   Description: Glance port.
+   Type: String
+  GlanceProtocol:
+   Default: http
+   Description: Protocol to use when connecting to glance, set to https for SSL.
+   Type: String
   GlancePassword:
     Default: unset
     Description: The password for the glance service account, used by the glance services.
@@ -194,6 +202,10 @@ Resources:
           backend: file
           db: mysql://glance:unset@localhost/glance
           host: 127.0.0.1
+          port:
+            Ref: GlancePort
+          protocol:
+            Ref: GlanceProtocol
           service-password:
             Ref: GlancePassword
           notifier-strategy:
-- 
2.16.6