diff --git a/Vagrantfile b/Vagrantfile index 7969857..f5b3bc1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,17 +2,15 @@ # vi: set ft=ruby : Vagrant.configure("2") do |config| - config.vm.box = "precise64-current" - config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box" - config.vm.network :forwarded_port, guest: 8080, host: 5000 - config.vm.network :private_network, ip: "172.16.5.10" - config.vm.synced_folder ".", "/vagrant", nfs: true - config.ssh.forward_agent = true + config.vm.box = "chef/ubuntu-14.04" + config.vm.synced_folder ".", "/vagrant" + config.vm.synced_folder "salt/roots/", "/srv/salt/" config.vm.provider :virtualbox do |vb| - vb.customize ["modifyvm", :id, "--memory", "1024"] + vb.customize ["modifyvm", :id, "--memory", "512"] end - config.vm.provision "ansible" do |ansible| - ansible.playbook = "provisioning/playbook.yml" - ansible.inventory_path = "provisioning/development" + config.vm.provision :salt do |salt| + salt.minion_config = "salt/minion.yml" + salt.run_highstate = true + salt.colorize = true end end diff --git a/provisioning/development b/provisioning/development deleted file mode 100644 index f634371..0000000 --- a/provisioning/development +++ /dev/null @@ -1,2 +0,0 @@ -[development] -172.16.5.10 diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml deleted file mode 100644 index 902b67d..0000000 --- a/provisioning/playbook.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- hosts: development - sudo: yes - roles: - - ntp - - golang - - vagrant diff --git a/provisioning/roles/golang/tasks/main.yml b/provisioning/roles/golang/tasks/main.yml deleted file mode 100644 index 7366ca9..0000000 --- a/provisioning/roles/golang/tasks/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: install golang - shell: curl https://go.googlecode.com/files/go1.2.linux-amd64.tar.gz | tar -zxC /usr/local - creates=/usr/local/go - -- name: configure path - copy: src=golang.sh - dest=/etc/profile.d/golang.sh - owner=root - group=root - mode=0644 diff --git a/provisioning/roles/ntp/files/timezone b/provisioning/roles/ntp/files/timezone deleted file mode 100644 index ccccd5d..0000000 --- a/provisioning/roles/ntp/files/timezone +++ /dev/null @@ -1 +0,0 @@ -Europe/Oslo diff --git a/provisioning/roles/ntp/handlers/main.yml b/provisioning/roles/ntp/handlers/main.yml deleted file mode 100644 index 9923d12..0000000 --- a/provisioning/roles/ntp/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: update timezone - command: dpkg-reconfigure --frontend=noninteractive tzdata diff --git a/provisioning/roles/ntp/tasks/main.yml b/provisioning/roles/ntp/tasks/main.yml deleted file mode 100644 index cff3d65..0000000 --- a/provisioning/roles/ntp/tasks/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: set timezone - copy: src=timezone - dest=/etc/timezone - owner=root - group=root - mode=0644 - notify: - - update timezone - -- name: install ntp - apt: pkg=ntp state=latest - -- name: make sure ntp is running - service: name=ntp state=running enabled=yes diff --git a/provisioning/roles/vagrant/files/dot.bash_profile b/provisioning/roles/vagrant/files/dot.bash_profile deleted file mode 100644 index 07718cf..0000000 --- a/provisioning/roles/vagrant/files/dot.bash_profile +++ /dev/null @@ -1,2 +0,0 @@ -export GOPATH=/vagrant -cd /vagrant diff --git a/provisioning/roles/vagrant/tasks/main.yml b/provisioning/roles/vagrant/tasks/main.yml deleted file mode 100644 index c07c2fe..0000000 --- a/provisioning/roles/vagrant/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: install packages - apt: pkg={{ item }} state=latest update_cache=yes cache_valid_time=3600 - with_items: - - gdb - - git - - make - - mercurial - environment: - LANG: en_US.UTF-8 - -- name: hide login message - copy: dest=/home/vagrant/.hushlogin - content= - owner=vagrant - group=vagrant - mode=0644 - -- name: install bash_profile - copy: src=dot.bash_profile - dest=/home/vagrant/.bash_profile - owner=vagrant - group=vagrant - mode=0644 diff --git a/salt/minion.yml b/salt/minion.yml new file mode 100644 index 0000000..92ccdc9 --- /dev/null +++ b/salt/minion.yml @@ -0,0 +1 @@ +file_client: local \ No newline at end of file diff --git a/salt/roots/dev.sls b/salt/roots/dev.sls new file mode 100644 index 0000000..b5eb125 --- /dev/null +++ b/salt/roots/dev.sls @@ -0,0 +1,20 @@ +packages: + pkg.installed: + - pkgs: + - git + - make + - mercurial + +/home/vagrant/.hushlogin: + file.managed: + - contents: "" + - user: vagrant + - group: vagrant + - mode: 0644 + +/home/vagrant/.bash_profile: + file.managed: + - source: salt://files/dot.bash_profile + - user: vagrant + - group: vagrant + - mode: 0644 \ No newline at end of file diff --git a/salt/roots/files/dot.bash_profile b/salt/roots/files/dot.bash_profile new file mode 100644 index 0000000..e6fb4ca --- /dev/null +++ b/salt/roots/files/dot.bash_profile @@ -0,0 +1,4 @@ +test -d $HOME/.local/bin || mkdir -p $HOME/.local/bin +export PATH=/vagrant/bin:$HOME/.local/bin:$PATH +export GOPATH=/vagrant +cd /vagrant diff --git a/provisioning/roles/golang/files/golang.sh b/salt/roots/files/golang.sh similarity index 100% rename from provisioning/roles/golang/files/golang.sh rename to salt/roots/files/golang.sh diff --git a/salt/roots/golang.sls b/salt/roots/golang.sls new file mode 100644 index 0000000..fde76db --- /dev/null +++ b/salt/roots/golang.sls @@ -0,0 +1,14 @@ +curl: + pkg: + - installed + +curl -L https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar -zxC /usr/local: + cmd.run: + - unless: test -d /usr/local/go + +/etc/profile.d/golang.sh: + file.managed: + - source: salt://files/golang.sh + - user: root + - group: root + - mode: 0644 \ No newline at end of file diff --git a/salt/roots/ntp.sls b/salt/roots/ntp.sls new file mode 100644 index 0000000..daf1671 --- /dev/null +++ b/salt/roots/ntp.sls @@ -0,0 +1,7 @@ +Europe/Oslo: + timezone.system +ntp: + pkg: + - installed + service: + - running \ No newline at end of file diff --git a/salt/roots/top.sls b/salt/roots/top.sls new file mode 100644 index 0000000..2a7dbe3 --- /dev/null +++ b/salt/roots/top.sls @@ -0,0 +1,6 @@ +--- +base: + '*': + - ntp + - dev + - golang