diff --git a/FORMULAS.yaml b/FORMULAS.yaml deleted file mode 120000 index 9291b26..0000000 --- a/FORMULAS.yaml +++ /dev/null @@ -1 +0,0 @@ -pillar/FORMULAS.yaml \ No newline at end of file diff --git a/bin/run_tests_locally.sh b/bin/run_tests_locally.sh index c063d84..7807303 100755 --- a/bin/run_tests_locally.sh +++ b/bin/run_tests_locally.sh @@ -69,7 +69,7 @@ while getopts h:c:k:p:s arg; do done print 'Pre-flight check ...' -test -L FORMULAS.yaml || fail 'Please run this script from the salt.git repository root.' +test -f encrypted_pillar_recipients || fail 'Please run this script from the salt.git repository root.' command -v podman >/dev/null || fail 'Please install Podman first.' command -v ssh >/dev/null || fail 'Please install the OpenSSH client first.' command -v rsync >/dev/null || fail 'Please install rsync first.' diff --git a/pillar/FORMULAS.yaml b/pillar/FORMULAS.yaml deleted file mode 100644 index 5dad72b..0000000 --- a/pillar/FORMULAS.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -git: - chrony: {} - elasticsearch: {} - firewalld: {} - haproxy: {} - hostsfile: {} - keepalived: {} - limits: - namespace: 'ryancurrah' - locale: {} - mysql: {} - nginx: {} - openldap: {} - openssh: {} - powerdns: {} - prometheus: {} - rsyslog: {} - salt: {} - sssd: - original_namespace: 'Spark-Networks' - namespace: 'tampakrap' - pending: - - 'https://github.com/Spark-Networks/salt-sssd-formula/pull/1' - prefix: 'salt-' - sudoers: {} - sysctl: {} - timezone: {} - users: {} - mirrorcache: - namespace: 'andrii-suse' -package: - - bootloader - - infrastructure - - grains - - juniper_junos - - libvirt - - lunmap - - multipath - - network - - os_update - - rebootmgr - - redmine - - redis - - rsync - - suse_ha - - zypper diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls index 35bac07..29b7e29 100644 --- a/pillar/role/saltmaster.sls +++ b/pillar/role/saltmaster.sls @@ -5,7 +5,6 @@ {%- set crt = ssldir ~ 'fullchain.pem' -%} {%- set key = ssldir ~ 'privkey.pem' -%} -{%- import_yaml 'FORMULAS.yaml' as formulas_yaml -%} include: - infra.nodegroups {% if salt['grains.get']('include_secrets', True) %} @@ -97,7 +96,24 @@ salt: infrastructure: salt: formulas: - {%- for formula in formulas_yaml['package'] %} + {%- for formula in [ + 'bootloader', + 'infrastructure', + 'grains', + 'juniper_junos', + 'libvirt', + 'lunmap', + 'multipath', + 'network', + 'os_update', + 'rebootmgr', + 'redmine', + 'redis', + 'rsync', + 'suse_ha', + 'zypper', + ] + %} - {{ formula }}-formula {%- endfor %}