commit 1bbf438e9dc21f45a7cc1e9248dc78f2bdbd2318
author Mykyta Karpin <mkarpin@mirantis.com> Fri Nov 02 11:12:20 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 02 11:12:20 2018 +0000
tree d6f1ae85ca4337efd302e485375a0556345ee630
parent 4a51bd000d8901f5a3ecaa8fcbcebae91d781c7c
parent 3561b43dc65b1e45e45c119d0a4afb030be61d10

Merge "Bump Pike reclass" into stable/pike

classes/cluster/virtual-mcp11-aio/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 2f3df0f..3e0d408 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -40,6 +40,7 @@
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    openscap_enabled: true
   openssh:
     server:
       password_auth: true

classes/cluster/virtual-mcp11-aio/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 37e8b8c..1c44b98 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -43,7 +43,6 @@
 parameters:
   _param:
     openstack_version: pike
-    openscap_enabled: true
     openstack_node_role: primary
     cluster_public_host: ${_param:single_address}
     cluster_public_protocol: http