Salt-formula-runtest change installation source
from git to pkg
Change-Id: I514d9869ae1dc3d09b04082d644becd660860fba
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 7d08f9a..76d3d63 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 iptables)
+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 iptables runtest artifactory)
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index ef2e18b..c59029b 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -8,25 +8,3 @@
name: cfg01
domain: ${_param:cluster_domain}
purge_repos: ${_param:linux_system_purge_repos}
- salt:
- master:
- worker_threads: 5
- environment:
- prd:
- formula:
- runtest:
- source: git
- address: 'https://gerrit.mcp.mirantis.net/salt-formulas/runtest'
- revision: master
- module:
- runtest: runtest
- state:
- runtest.py: runtest.py
- artifactory:
- source: git
- address: 'https://gerrit.mcp.mirantis.net/salt-formulas/artifactory'
- revision: master
- module:
- artifactory.py: artifactory.py
- state:
- artifactory.py: artifactory.py
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index fd1ce9e..b0f5ddc 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -27,6 +27,7 @@
- system.cinder.volume.backend.lvm
- system.horizon.server.single
- system.bind.server.single
+- service.runtest.tempest
parameters:
_param:
openstack_version: mitaka