Merge "Add variables block_migration_for_live_migration, block_migrate_cinder_iscsi"
diff --git a/runtest/artifact_collector.sls b/runtest/artifact_collector.sls
index 27a678d..e66ae54 100644
--- a/runtest/artifact_collector.sls
+++ b/runtest/artifact_collector.sls
@@ -1,6 +1,10 @@
{%- from "runtest/map.jinja" import artifact_collector with context %}
{%- if artifact_collector.get('enabled', False) -%}
+required_artifact_pkgs:
+ pkg.installed:
+ - names: {{ artifact_collector.pkgs }}
+
{%- for cmd_name, cmd_params in artifact_collector.cmds.iteritems() %}
{%- set cmd = cmd_params.cmd + " > " + cmd_params.dst %}
run_{{ cmd_name }}:
@@ -13,6 +17,8 @@
- name: artifactory.deploy_artifact
- source_file: {{ cmd_params.dst }}
- endpoint: {{ artifact_collector.artifactory.endpoint }}
+ - require:
+ - pkg: required_artifact_pkgs
- kwargs:
user: {{ artifact_collector.artifactory.user }}
password: {{ artifact_collector.artifactory.password }}
@@ -39,6 +45,8 @@
- name: artifactory.deploy_artifact
- source_file: {{ zip_file }}
- endpoint: {{ artifact_collector.artifactory.endpoint }}
+ - require:
+ - pkg: required_artifact_pkgs
- kwargs:
user: {{ artifact_collector.artifactory.user }}
password: {{ artifact_collector.artifactory.password }}
diff --git a/runtest/map.jinja b/runtest/map.jinja
index ab01c64..2067741 100644
--- a/runtest/map.jinja
+++ b/runtest/map.jinja
@@ -28,7 +28,8 @@
'cmd': 'dpkg -l',
'dst': '/tmp/packages.txt'
}
- }
+ },
+ 'pkgs': ['python-lxml']
}
}, grain='os', merge=salt['pillar.get']('runtest', {}).get('artifact_collector', {}), base='default') %}