From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 12 Nov 2017 05:45:50 +0000 (+0100)
Subject: [baremetal] prx: Fix empty Apache module list
X-Git-Tag: opnfv-6.0.0~269
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F47085%2F1;p=fuel.git

[baremetal] prx: Fix empty Apache module list

On low state expansion, apache.server.modules is iterated, and
since reclass transforms '~' into 'null', an exception is thrown.

Use an empty string instead (different type will still ensure reclass
overrides variables from apache service instead of merging the lists).

While at it, add missing version 'latest' for mod-wsgi pkg.

Change-Id: I7913483b6a1be545b96de2958c39840940d9c557
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index d93d9ee5b..a2d39854e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -41,6 +41,7 @@ parameters:
     system:
       package:
         libapache2-mod-wsgi:
+          version: latest
   salt:
     minion:
       cert:
@@ -49,7 +50,7 @@ parameters:
           key_usage: 'digitalSignature, keyEncipherment'
   apache:
     server:
-      modules: ~
+      modules: ''
   horizon:
     server:
       bind: