Fix formula for storage 'git' and 'pip'
Fixes: PROD-33985
This fix is already present in release/2019.2.0 branch
as a part of change https://gerrit.mcp.mirantis.com/#/c/52348/
Change-Id: I830e05f4da15b4bf05d926fd62a3b03499abb928
diff --git a/.kitchen.yml b/.kitchen.yml
index c650450..4c52644 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -61,15 +61,15 @@
pillars-from-files:
reclass.sls: tests/pillar/storage_local.sls
- # - name: storage_git
- # provisioner:
- # pillars-from-files:
- # reclass.sls: tests/pillar/storage_git.sls
+ - name: storage_git
+ provisioner:
+ pillars-from-files:
+ reclass.sls: tests/pillar/storage_git.sls
- # - name: storage_pip
- # provisioner:
- # pillars-from-files:
- # reclass.sls: tests/pillar/storage_pip.sls
+ - name: storage_pip
+ provisioner:
+ pillars-from-files:
+ reclass.sls: tests/pillar/storage_pip.sls
- name: storage_nodes_uri
provisioner:
diff --git a/reclass/storage/service.sls b/reclass/storage/service.sls
index 5c43c4d..3d1da17 100644
--- a/reclass/storage/service.sls
+++ b/reclass/storage/service.sls
@@ -20,8 +20,7 @@
{%- elif storage.source.engine == 'git' %}
storage_install_git_python_pip:
pkg.installed:
- - names:
- - {{ storage.dependency.pkgs }}
+ - names: {{ storage.dependency.pkgs }}
storage_install_reclass_git:
pip.installed:
@@ -36,8 +35,7 @@
{%- elif storage.source.engine == 'pip' %}
storage_install_python_pip:
pkg.installed:
- - names:
- - {{ storage.dependency.pkgs }}
+ - names: {{ storage.dependency.pkgs }}
storage_install_reclass_pip:
pip.installed:
@@ -46,7 +44,7 @@
- force_reinstall: True
- ignore_installed: True
- require:
- - pkg: storage_install_git_python_pip
+ - pkg: storage_install_python_pip
{%- endif %}
{%- endif %}