aboutsummaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
diff options
context:
space:
mode:
authorRyan Moore <ryan.moore@hp.com>2014-04-03 16:37:54 +0100
committerRyan Moore <ryan.moore@hp.com>2014-06-16 09:55:41 +0100
commit9a3f38a7dfa4664227d642b4db74c42a3a690d2d (patch)
treeb6d8389914dda97840c4155f48015b10196b950a /nova-compute-instance.yaml
parent36ff86ceb4e1f0a6a909e8c8a0f5cae9b2e7487a (diff)
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
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml10
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}