diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-06-22 12:17:55 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-06-29 13:44:51 +0000 |
| commit | c444b36187faa504ae4d5b09eb22c97b3037e6dd (patch) | |
| tree | 4d54f4658a25675c5e4e2b5e81be0afb3a165557 /manifests/profile/base/neutron/plugins/ml2.pp | |
| parent | 6cb9f63e6208e992fa8d2ac84706c81138df81fc (diff) | |
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
Diffstat (limited to 'manifests/profile/base/neutron/plugins/ml2.pp')
| -rw-r--r-- | manifests/profile/base/neutron/plugins/ml2.pp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |