From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 26 Jan 2017 21:45:55 +0000 (-0500)
Subject: horizon: be more flexible in hiera neutron
X-Git-Tag: opnfv-6.0.0~375^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=62bb10b8995b5b616bdfe98a4d76ebd84e50cfa0;p=apex-puppet-tripleo.git

horizon: be more flexible in hiera neutron

Requiring the neutron mechanism driver from hiera is too rigid, if
Neutron is not deployed in the catalog.
Be more flexible so catalog won't fail if the value is not set in Hiera.

Change-Id: I1475687c4dc53c77e763f42a440355a7c8d014bc
Partial-Bug: #1659662
---

diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index be07c0e..bd28ab0 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -30,7 +30,7 @@ class tripleo::profile::base::horizon (
     # Horizon
     include ::apache::mod::remoteip
     include ::apache::mod::status
-    if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
+    if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers', undef) {
       $_profile_support = 'cisco'
     } else {
       $_profile_support = 'None'