puppet: tidy up the Nova glance API server config

Updates the puppet configuration for the Nova glance configs
so that we do the join conversions in the Heat templates and
use only hiera for configuration of the ::nova class.

Change-Id: Id12fb05470470558f1dccd45150bfce00a554466

diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 7005981..f734709 100644 (file)
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -290,9 +290,7 @@ resources:
                 ceilometer_compute_agent: {get_input: ceilometer_compute_agent}
                 snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
                 snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
-                glance_host: {get_input: glance_host}
-                glance_port: {get_input: glance_port}
-                glance_protocol: {get_input: glance_protocol}
+                nova::glance_api_servers: {get_input: glance_api_servers}
                 keystone_host: {get_input: keystone_host}
                 #neutron::debug: {get_input: debug}
                 neutron_flat_networks: {get_input: neutron_flat_networks}
@@ -346,9 +344,14 @@ resources:
         ceilometer_compute_agent: {get_param: CeilometerComputeAgent}
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
-        glance_host: {get_param: GlanceHost}
-        glance_port: {get_param: GlancePort}
-        glance_protocol: {get_param: GlanceProtocol}
+        glance_api_servers:
+          list_join:
+            - ''
+            - - {get_param: GlanceProtocol}
+              - '://'
+              - {get_param: GlanceHost}
+              - ':'
+              - {get_param: GlancePort}
         keystone_host: {get_param: KeystoneHost}
         neutron_flat_networks: {get_param: NeutronFlatNetworks}
         neutron_host: {get_param: NeutronHost}

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 150e985..cff0548 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -28,16 +28,13 @@ if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
 
-class { 'nova':
-  glance_api_servers => join([hiera('glance_protocol'), '://', hiera('glance_host'), ':', hiera('glance_port')]),
-}
-
 file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
         '/etc/libvirt/qemu/networks/default.xml']:
   ensure => absent,
   before => Service['libvirt']
 }
 
+include ::nova
 include ::nova::compute
 
 nova_config {