From c392dffb9d55b5a0c9798f0152068ed8e5c7dd3b Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 12 Mar 2015 17:42:31 -0400 Subject: 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 --- puppet/manifests/overcloud_compute.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'puppet/manifests/overcloud_compute.pp') diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 150e9858..cff0548f 100644 --- 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 { -- cgit 1.2.3-korg