summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-12 06:45:50 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-12 16:15:52 +0000
commitfdc7c2bae55d3a4d1aa84666be6286de25e3e0f4 (patch)
treea965b512246346e3b4dd281a25a918f447b10275 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
parent088f3c7325d5ca443c6f9e202497503982c61401 (diff)
[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> (cherry picked from commit 40f907255380dbfc4d808d9f3c768db80c4c8158)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml3
1 files changed, 2 insertions, 1 deletions
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: