Merge "Set glance protocol and port as Heat configurable"

3 files changed, 34 insertions, 0 deletions

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 496b2431..e4439f0e 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.
@@ -408,6 +416,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 a78e069b..66517586 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.
@@ -222,6 +230,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: