From 9a3f38a7dfa4664227d642b4db74c42a3a690d2d Mon Sep 17 00:00:00 2001 From: Ryan Moore Date: Thu, 3 Apr 2014 16:37:54 +0100 Subject: 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 --- nova-compute-instance.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'nova-compute-instance.yaml') 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} -- cgit 1.2.3-korg