Enable artifact_collector
This patch activates artifact_collector for the model
Change-Id: I3e211c52592fd9d8493d92c9aab859c71087ed40
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index 8b1bb8c..ef2e18b 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -22,3 +22,11 @@
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 21f3d0e..95cd7ce 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -133,6 +133,8 @@
rabbitmq_port: 5671 # for non-ssl use 5672
runtest_tempest_cfg_dir: /root/rally_reports/
runtest_tempest_cfg_name: tempest_generated.conf
+ artifactory_user: artifactory_user
+ artifactory_password: artifactory_password
galera:
master:
members: ~
@@ -295,3 +297,18 @@
bug_1573141_fixed: true
volume-feature-enabled:
backup: false
+ artifact_collector:
+ enabled: true
+ artifactory:
+ enabled: true
+ user: ${_param:artifactory_user}
+ password: ${_param:artifactory_password}
+ host: artifactory.mcp.mirantis.net
+ port: 443
+ proto: https
+ endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
+ artifacts:
+ sys_logs:
+ path: /var/log
+ etc:
+ path: /etc