Merge "Remove extra list"

[apex-tripleo-heat-templates.git] / undercloud-source.yaml

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index a78e069..aa0c9ee 100644 (file)
--- 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:
@@ -293,6 +305,8 @@ Resources:
         Ref: KeyName
       image_update_policy:
         Ref: ImageUpdatePolicy
+      networks:
+        - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
   99_undercloudDeployment:
     Type: OS::Heat::StructuredDeployment