From 93c5d6103f9d4c12cd401d30b2408a8532c94922 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 8 Jul 2016 09:07:27 -0400 Subject: Use include for base neutron profile Simplify the base neutron profile so that we always include the neutron and neutron::config classes at step 3. In doing so we can now simplify the pacemaker version to use a simple include which will avoid duplicate class errors. Change-Id: I95b9188607ab6c599ad4cde6faa1deb081618f3e --- manifests/profile/pacemaker/neutron.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'manifests/profile/pacemaker') diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index fff731d..75a75b3 100644 --- a/manifests/profile/pacemaker/neutron.pp +++ b/manifests/profile/pacemaker/neutron.pp @@ -61,9 +61,7 @@ class tripleo::profile::pacemaker::neutron ( stop => '/bin/true', } - class { '::tripleo::profile::base::neutron': - sync_db => ($::hostname == downcase($pacemaker_master)), - } + include ::tripleo::profile::base::neutron if $step >= 4 { include ::neutron::params -- cgit 1.2.3-korg