diff options
-rw-r--r-- | puppet/hieradata/compute.yaml | 2 | ||||
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index fa8dcc81..572eef9f 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -1,7 +1,7 @@ # 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' diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index edeaa61a..fb36893d 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -509,9 +509,7 @@ if hiera('step') >= 3 { sync_db => $sync_db, manage_service => false, enabled => false, - # TODO: when keystone resources will be managed by puppet-keystone - # for the overcloud, set enable_bootstrap to the default value (True). - enable_bootstrap => false, + enable_bootstrap => $pacemaker_master, } include ::keystone::config |