Merge "Deploy Aodh services, replacing Ceilometer Alarm"

[apex-tripleo-heat-templates.git] / puppet / hieradata / compute.yaml

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 8858fd6..865210c 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -1,18 +1,14 @@
 # Hiera data here applies to all compute nodes
 
 nova::notify_on_state_change: 'vm_and_task_state'
-
+nova::notification_driver: messagingv2
 nova::compute::enabled: true
 nova::compute::instance_usage_audit: true
 nova::compute::instance_usage_audit_period: 'hour'
 nova::compute::vnc_enabled: true
 
-nova::compute::libvirt::vncserver_listen: '0.0.0.0'
 nova::compute::libvirt::migration_support: true
 
-nova::compute::rbd::libvirt_rbd_user: 'openstack'
-nova::compute::rbd::rbd_keyring: 'client.openstack'
-nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
 nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
 
 # Changing the default from 512MB. The current templates can not deploy
@@ -22,5 +18,6 @@ nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fs
 nova::compute::reserved_host_memory: 2048
 
 ceilometer::agent::auth::auth_tenant_name: 'service'
+ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 
 compute_classes: []