summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-27 07:53:53 +0000
committerGerrit Code Review <review@openstack.org>2014-06-27 07:53:53 +0000
commit9e33760e06116fd44d9766b4b5828a29e69ec736 (patch)
tree194f63f26470757721789dcbb2d321b77fad0bdc
parent8fc307cc22da5375e9808ffa853cf1af04554078 (diff)
parent9a3f38a7dfa4664227d642b4db74c42a3a690d2d (diff)
Merge "Set glance protocol and port as Heat configurable"
-rw-r--r--nova-compute-instance.yaml10
-rw-r--r--overcloud-source.yaml12
-rw-r--r--undercloud-source.yaml12
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: