diff --git a/README.md b/README.md index 5804d6d..5db4ad8 100644 --- a/README.md +++ b/README.md @@ -70,11 +70,7 @@ minion04: True ``` -And finally, as a treat, apply a [Salt state to install vim and my vimrc](srv/salt/vim/init.sls) on the minions with the `roles:saltlab` grain: -```shell -sudo salt -G 'roles:saltlab` state.apply vim -``` - -To blow it all away for a fresh start, just run `vagrant destroy -f`. - Happy Salting! + +## Cleanup +To blow it all away for a fresh start, just run `vagrant destroy -f`. diff --git a/Vagrantfile b/Vagrantfile index 2f5a76f..b9f94b5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -56,6 +56,7 @@ EOF grains: roles: - saltlab + - web EOF systemctl restart salt-minion SHELL @@ -99,6 +100,7 @@ EOF grains: roles: - saltlab + - web EOF systemctl restart salt-minion SHELL diff --git a/srv/salt/cowsay/init.sls b/srv/salt/cowsay/init.sls new file mode 100644 index 0000000..8075a46 --- /dev/null +++ b/srv/salt/cowsay/init.sls @@ -0,0 +1,3 @@ +install_cowsay: + pkg.installed: + - name: cowsay diff --git a/srv/salt/cowsay/uninstall.sls b/srv/salt/cowsay/uninstall.sls new file mode 100644 index 0000000..772913e --- /dev/null +++ b/srv/salt/cowsay/uninstall.sls @@ -0,0 +1,3 @@ +uninstall_cowsay: + pkg.removed: + - name: cowsay diff --git a/srv/salt/top.sls b/srv/salt/top.sls new file mode 100644 index 0000000..9d1c8f4 --- /dev/null +++ b/srv/salt/top.sls @@ -0,0 +1,9 @@ +base: + '*': + - vim + 'roles:saltlab': + - match: grain + - cowsay + 'roles:web': + - match: grain + - nginx