Merge "Set glance protocol and port as Heat configurable"

1 files changed, 10 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}