diff --git a/pillars/roles.jinja b/pillars/roles.jinja index d279884..f0e7401 100644 --- a/pillars/roles.jinja +++ b/pillars/roles.jinja @@ -1 +1 @@ -{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls | tr '\n' ' '") -%} +{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls").split('\n') -%} diff --git a/pillars/servers/passwords.sls b/pillars/servers/passwords.sls deleted file mode 100644 index 0620c5f..0000000 --- a/pillars/servers/passwords.sls +++ /dev/null @@ -1,3 +0,0 @@ -{%- from "roles.jinja" import roles with context %} -{%- set data=salt.cmd.shell('sudo bash ~/get_passwords.sh '+roles) -%} -{{data | trim}}