Commit 41a9e23328db99c055dda3f7889f74141df9ba65
enhance
Michael Williams committed on 12/23/2017, 1:18:19 PMParent: e2e4e94c17c6f1522080ddb39ec6b7ba3f4d83e6
Files changed
| INSTALL.md | changed |
| example/salt/pillar/cloud.sls | changed |
| example/salt/pillar/top.sls | changed |
| example/salt/pillar/base.sls | deleted |
| example/salt/pillar/salt.sls | added |
| INSTALL.md | |||
|---|---|---|---|
| @@ -1,9 +1,9 @@ | |||
| 1 | 1 … | # install | |
| 2 | 2 … | ||
| 3 | 3 … | --- | |
| 4 | 4 … | ||
| 5 | -provision new Scaleway server | ||
| 5 … | +provision new server | ||
| 6 | 6 … | ||
| 7 | 7 … | --- | |
| 8 | 8 … | ||
| 9 | 9 … | install salt stack | |
| @@ -37,16 +37,15 @@ | |||
| 37 | 37 … | ```yaml | |
| 38 | 38 … | fileserver_backend: | |
| 39 | 39 … | - git | |
| 40 | 40 … | ||
| 41 | -gitfs_privkey: /root/.ssh/id_rsa | ||
| 42 | -gitfs_pubkey: /root/.ssh/id_rsa.pub | ||
| 43 | 41 … | gitfs_remotes: | |
| 44 | - - git@github.com:ahdinosaur/butt-as-a-service: | ||
| 42 … | + - git://github.com/saltstack-formulas/salt-formula | ||
| 43 … | + - git://github.com/ahdinosaur/butt-as-a-service: | ||
| 45 | 44 … | - root: salt/state | |
| 46 | 45 … | ||
| 47 | -ext_pillar_privkey: /root/.ssh/id_rsa | ||
| 48 | -ext_pillar_pubkey: /root/.ssh/id_rsa.pub | ||
| 46 … | +git_pillar_privkey: /root/.ssh/id_rsa | ||
| 47 … | +git_pillar_pubkey: /root/.ssh/id_rsa.pub | ||
| 49 | 48 … | ext_pillar: | |
| 50 | 49 … | - git: | |
| 51 | 50 … | - master git@github.com:${user}/${repo}: | |
| 52 | 51 … | - root: salt/pillar | |
| example/salt/pillar/cloud.sls | ||
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| 1 | 1 … | cloud: |
| 2 | 2 … | ssh_key_name: salt |
| 3 | 3 … | ssh_key_file: /root/.ssh/id_rsa |
| 4 | - | |
| 5 | - minion: | |
| 6 | - master: salt.butt.nz | |
| 7 | 4 … | |
| 8 | 5 … | providers: |
| 9 | 6 … | scaleway: |
| 10 | 7 … | driver: scaleway |
| example/salt/pillar/top.sls | ||
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| 1 | -base: | |
| 1 … | +production: | |
| 2 | 2 … | '*': |
| 3 | - - cloud | |
| 4 | 3 … | - agents |
| 4 … | + {% set roles = salt['grains.get']('roles', []) -%} | |
| 5 … | + {% for role in roles -%} | |
| 6 … | + 'roles:{{ role }}': | |
| 7 … | + - match: grain | |
| 8 … | + - {{ role }} | |
| 9 … | + {% endfor -%} | |
| example/salt/pillar/base.sls | ||
|---|---|---|
| @@ -1,5 +1,0 @@ | ||
| 1 | -master: salt.butt.nz | |
| 2 | -git_pubkey: /root/.ssh/id_rsa | |
| 3 | -git_privkey: /root/.ssh/id_rsa.pub | |
| 4 | -pillar_git: git@github.com:ahdinosaur/salt.butt.nz | |
| 5 | -state_git: git@github.com:ahdinosaur/butt-as-a-service | |
| example/salt/pillar/salt.sls | ||
|---|---|---|
| @@ -1,0 +1,19 @@ | ||
| 1 … | +salt: | |
| 2 … | + master: | |
| 3 … | + fileserver_backend: | |
| 4 … | + - git | |
| 5 … | + | |
| 6 … | + gitfs_remotes: | |
| 7 … | + - https://github.com/saltstack-formulas/salt-formula | |
| 8 … | + - https://github.com/ahdinosaur/butt-as-a-service: | |
| 9 … | + - root: salt/state | |
| 10 … | + | |
| 11 … | + ext_pillar_privkey: /root/.ssh/id_rsa | |
| 12 … | + ext_pillar_pubkey: /root/.ssh/id_rsa.pub | |
| 13 … | + ext_pillar: | |
| 14 … | + - git: | |
| 15 … | + - master git@github.com:ahdinosaur/salt.butt.nz: | |
| 16 … | + - root: salt/pillar | |
| 17 … | + | |
| 18 … | + minion: | |
| 19 … | + master: salt.butt.nz | |
Built with git-ssb-web