diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-18 09:52:16 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-18 09:52:16 +0000 |
commit | 93eeb887a7bae59c43c9e864c20d3c844592f68b (patch) | |
tree | 95f13fce2bc632a2d2c3f49eada534a24dfbfed8 /manifests/profile/pacemaker/neutron/metadata.pp | |
parent | a555a26421deda2f601e2127a9ecaf0b4590a11f (diff) | |
parent | 837643416d6fc636336d74b1da800a295c3d49a3 (diff) |
Merge "Remove manage_service and enabled from TripleO manifests"
Diffstat (limited to 'manifests/profile/pacemaker/neutron/metadata.pp')
-rw-r--r-- | manifests/profile/pacemaker/neutron/metadata.pp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp index 4030bb2..e6bccb1 100644 --- a/manifests/profile/pacemaker/neutron/metadata.pp +++ b/manifests/profile/pacemaker/neutron/metadata.pp @@ -34,11 +34,8 @@ class tripleo::profile::pacemaker::neutron::metadata ( include ::neutron::params include ::tripleo::profile::pacemaker::neutron + include ::tripleo::profile::base::neutron::metadata - class { '::tripleo::profile::base::neutron::metadata': - manage_service => false, - enabled => false, - } if $step >= 5 and downcase($::hostname) == $pacemaker_master { pacemaker::resource::service { $::neutron::params::metadata_agent_service: clone_params => 'interleave=true', |