From c444b36187faa504ae4d5b09eb22c97b3037e6dd Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 22 Jun 2016 12:17:55 -0400
Subject: neutron plugins: include neutron base

neutron base is required by plugins to work correctly. Let's add it here
so we don't have to deal with it in THT.

Change-Id: Icaf6b0479297983220874d7ee9ea2c3336706332
---
 manifests/profile/base/neutron/plugins/ml2.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'manifests/profile/base/neutron/plugins/ml2.pp')

diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index b462e1b..04c6244 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -37,9 +37,10 @@ class tripleo::profile::base::neutron::plugins::ml2 (
   $step               = hiera('step'),
 ) {
 
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::ml2
-    include ::tripleo::profile::base::neutron
 
     if 'cisco_n1kv' in $mechanism_drivers {
       include ::tripleo::profile::base::neutron::n1k
-- 
cgit 1.2.3-korg