diff options
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 0d2790b2..eef468da 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 { @@ -45,13 +42,20 @@ nova_config { 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; } -include ::nova::compute::libvirt - -class { 'nova::network::neutron': - neutron_admin_auth_url => join(['http://', hiera('neutron_host'), ':35357/v2.0']), - neutron_url => join(['http://', hiera('neutron_host'), ':9696']), +$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false) +if $nova_enable_rbd_backend { + include ::ceph::profile::client + include ::nova::compute::rbd + ceph::key { 'client.openstack' : + secret => hiera('ceph::profile::params::mon_key'), + cap_mon => hiera('ceph_openstack_default_cap_mon'), + cap_osd => hiera('ceph_openstack_default_cap_osd'), + user => 'nova', + } } +include ::nova::compute::libvirt +include ::nova::network::neutron include ::neutron class { 'neutron::plugins::ml2': @@ -67,10 +71,7 @@ class { 'neutron::agents::ml2::ovs': include ::ceilometer include ::ceilometer::agent::compute - -class { 'ceilometer::agent::auth': - auth_url => join(['http://', hiera('keystone_host'), ':5000/v2.0']), -} +include ::ceilometer::agent::auth $snmpd_user = hiera('snmpd_readonly_user_name') snmp::snmpv3_user { $snmpd_user: |