[Queens] Add Openscap to mcp-virtual-aio model
Change-Id: I8d39f5072fdf7df61b86a7529bcf82f7594cbac3
Related-PROD: https://mirantis.jira.com/browse/PROD-19935
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 1e695b2..9c45e38 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 400e841..6878640 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -7,6 +7,7 @@
- system.openssh.server.team.lab
- system.salt.master.api
- system.salt.master.pkg
+- system.salt.master.formula.pkg.openscap
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
- system.reclass.storage.salt
@@ -15,6 +16,7 @@
- system.rabbitmq.server.single
- cluster.virtual-mcp11-aio.openstack
- system.auditd.server.ciscat
+- system.openscap.server
- cluster.overrides
parameters:
_param: