diff --git a/deepsea/defaults.yaml b/deepsea/defaults.yaml index 9dc01c7..a6a1edb 100644 --- a/deepsea/defaults.yaml +++ b/deepsea/defaults.yaml @@ -27,15 +27,16 @@ deepsea: dev_env: True packages: - # Should this formula manage package dependencies? True means yes; False NO. - # Ideally `DeepSea` (or `packages-formula`) should handle package dependencies. + # should formula manage package dependencies? True means yes; False NO. + # ideally `DeepSea` (or `packages-formula`) handle package dependencies. managed: False required: - python-setuptools + - python3 - python3-boto - python3-rados - lsscsi - - jq + - jq # needs epel on centos - pciutils - salt-api - git diff --git a/deepsea/install.sls b/deepsea/install.sls index f34f293..6bcb8ff 100644 --- a/deepsea/install.sls +++ b/deepsea/install.sls @@ -23,10 +23,11 @@ deepsea-directories: - user - group - mode + - require_in: + - file: deepsea-software deepsea-software: {% if deepsea.use_upstream_pkgrepo %} - {# using upstream pkgrepo #} pkgrepo.managed: - name: deepsea-{{ deepsea.release }} - humanname: {{ deepsea.repo.name }} @@ -37,11 +38,12 @@ deepsea-software: - require: - file: deepsea-directories pkg.installed: - - pkgs: {{ deepsea.packages.required }} - - require: - - pkgrepo: deepsea-software + - name: deepsea + {% else %} - {# using gitrepo not upstream pkgrepo #} + + pkg.installed: + - name: make pkgrepo.absent: - name: deepsea-{{ deepsea.release }} - require_in: @@ -66,6 +68,7 @@ deepsea-software: {% endif %} - require: - file: deepsea-directories + - pkg: deepsea-software - pkgrepo: deepsea-software - require_in: - file: deepsea-config-global diff --git a/deepsea/osfamilymap.yaml b/deepsea/osfamilymap.yaml index 6bde15e..c11e2b1 100644 --- a/deepsea/osfamilymap.yaml +++ b/deepsea/osfamilymap.yaml @@ -21,12 +21,17 @@ Suse: - gptfdisk - iperf - lsof + - python3-setuptools + - python3-click + - python3-tox + - python3-configobj Debian: packages: required: - gdisk - iperf + - python-tox RedHat: services: @@ -35,6 +40,8 @@ RedHat: - salt-minion packages: required: + - python-setuptools + - python-configobj - python-click - python-tox - python-netaddr @@ -42,4 +49,3 @@ RedHat: - gdisk - lshw - hwinfo - diff --git a/deepsea/packages.sls b/deepsea/packages.sls index 6f99e42..7cd581c 100644 --- a/deepsea/packages.sls +++ b/deepsea/packages.sls @@ -3,8 +3,6 @@ {% from "deepsea/map.jinja" import deepsea with context -%} - {% if deepsea.packages.managed %} - deepsea-packages-common-dependencies: pkg.installed: - pkgs: @@ -12,5 +10,3 @@ deepsea-packages-common-dependencies: {% for pkg in deepsea.packages.required %} - {{ pkg }} {% endfor %} - - {% endif %} diff --git a/pillar.example b/pillar.example index 53b7c64..9271194 100644 --- a/pillar.example +++ b/pillar.example @@ -1,7 +1,8 @@ deepsea: - release: luminous - # clone software from git (default) + release: nautilus + # clone software from git (default: True) use_upstream_gitrepo: True + # or use a package repo (default: False) use_upstream_pkgrepo: False dev_env: False @@ -14,5 +15,8 @@ deepsea: dev_env: False packages: - # Set True if https://github.com/saltstack-formulas/packages-formula is used/preferred + # Manage dependency packages with https://github.com/saltstack-formulas/packages-formula formula: False + # Manage packages with this formula + managed: True + required: []