summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-19 11:13:10 +0000
committerGerrit Code Review <review@openstack.org>2015-03-19 11:13:10 +0000
commit5bb35b7a050f23887a726547ce37519c6604e8fe (patch)
tree2f7ecf9ad571f916bfba4b2aab83e0810c2410a2
parent558cd7d09ce0604dd744a3fd2166ce361ad90cc2 (diff)
parentc392dffb9d55b5a0c9798f0152068ed8e5c7dd3b (diff)
Merge "puppet: tidy up the Nova glance API server config"
-rw-r--r--puppet/compute-puppet.yaml15
-rw-r--r--puppet/manifests/overcloud_compute.pp5
2 files changed, 10 insertions, 10 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 8df61b22..909fdf5c 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -299,9 +299,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}
@@ -356,9 +354,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 8468cd39..63ead74f 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 {