commit 551002050ad5d6f2d89dddc0a5f94b380b0e8d3a
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Nov 06 17:59:47 2018 +0000
committer Gerrit Code Review <mail@domain.com> Tue Nov 06 17:59:47 2018 +0000
tree affeaa52e0841b72751f850c8165f1ce27b51bdb
parent 1d4234974ce85c6dc3f65ef690ec0b84893b6372
parent 161cb7fb1c66d9902e91b6a10d3717b21ef752b1

Merge "Switch k8s component sources to binary instead of docker image."

apache/server/single.yml

diff --git a/apache/server/single.yml b/apache/server/single.yml
index 06c8c4c..cbe5158 100644
--- a/apache/server/single.yml
+++ b/apache/server/single.yml
@@ -1,2 +1,9 @@
 classes:
 - service.apache.server.single
+parameters:
+  apache:
+    server:
+      mods:
+        status:
+          enabled: ${_param:apache_mods_status_enabled}
+          status: ${_param:apache_mods_status_status}

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index cc580b8..e6dd320 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -36,3 +36,6 @@
     # Openstack memcached server protocols
     openstack_memcached_proto_tcp_enabled: True
     openstack_memcached_proto_udp_enabled: False
+    # Apache mods defaults
+    apache_mods_status_enabled: True
+    apache_mods_status_status: 'disabled'