commit 88368e5ee7b96f7cb8560ff0ea0447b7871493eb
author Oleg Iurchenko <oiurchenko@mirantis.com> Tue Jan 30 15:55:38 2018 +0200
committer Oleg Iurchenko <oiurchenko@mirantis.com> Tue Jan 30 16:34:52 2018 +0000
tree 15457134d14126213d28332031b44f53cfaee666
parent a1300eedd14c205298066cf79bf975d77d5cbe01

Enable artifact_collector

This patch activates artifact_collector for the model

Change-Id: I3e211c52592fd9d8493d92c9aab859c71087ed40

classes/cluster/virtual-mcp11-aio/infra/config.yml

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

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 bb8a80a..fd1ce9e 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -85,6 +85,8 @@
     openstack_public_neutron_subnet_allocation_end: 192.168.130.254
     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: ~
@@ -134,3 +136,18 @@
         max_resources_per_stack: 20000
       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