Improve salt setup
This commit improves the salt setup of the Vagrant box: - Salt output is reduced to log level warning - Hosts entries are created for the internal IPs of all planned gva component VMs - .bashrc and a .bash_functions sourced from it are now managed for the vagrant user - the VM name has been changed to gva.local - recent salt versions do not depend on m2crypto anymore, therefore it is now installed before x509certificate functions are called - the rabbitmq_vhost for gva is now setup before any users are created because the previous implementation was broken with recent salt versions - the gnuviechadmin-locale-data-compile step has been simplified because Django 1.9's compilemessages takes care of recursive .mo file compilation - pillar data has been separated by role (especially queue permissions and credentials) - salt configuration is now unified with gvaldap
This commit is contained in:
parent
f1f0e35ea1
commit
6147a90066
36 changed files with 523 additions and 188 deletions
5
Vagrantfile
vendored
5
Vagrantfile
vendored
|
@ -14,7 +14,7 @@ Vagrant.configure(2) do |config|
|
|||
# boxes at https://atlas.hashicorp.com/search.
|
||||
config.vm.box = "debian/jessie64"
|
||||
|
||||
config.vm.hostname = "gva-dev"
|
||||
config.vm.hostname = "gva.local"
|
||||
|
||||
# Disable automatic box update checking. If you disable this, then
|
||||
# boxes will only be checked for updates when the user runs
|
||||
|
@ -60,10 +60,11 @@ Vagrant.configure(2) do |config|
|
|||
|
||||
config.vm.provision :salt do |salt|
|
||||
salt.bootstrap_script = "salt/bootstrap.sh"
|
||||
salt.minion_id = "gvadev"
|
||||
salt.minion_id = "gva.local"
|
||||
salt.masterless = true
|
||||
salt.run_highstate = true
|
||||
salt.verbose = true
|
||||
salt.colorize = true
|
||||
salt.log_level = "warning"
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue