Improve Vagrant setup
Use debian/contrib-jessie64 base box, install python-cryptography before saltstack bootstrap.
This commit is contained in:
		
							parent
							
								
									2ff7dd8902
								
							
						
					
					
						commit
						937d0aff97
					
				
					 2 changed files with 8 additions and 42 deletions
				
			
		
							
								
								
									
										45
									
								
								Vagrantfile
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										45
									
								
								Vagrantfile
									
										
									
									
										vendored
									
									
								
							|  | @ -1,58 +1,19 @@ | ||||||
| # -*- mode: ruby -*- | # -*- mode: ruby -*- | ||||||
| # vi: set ft=ruby : | # vi: set ft=ruby : | ||||||
| 
 | 
 | ||||||
| # All Vagrant configuration is done below. The "2" in Vagrant.configure |  | ||||||
| # configures the configuration version (we support older styles for |  | ||||||
| # backwards compatibility). Please don't change it unless you know what |  | ||||||
| # you're doing. |  | ||||||
| Vagrant.configure(2) do |config| | Vagrant.configure(2) do |config| | ||||||
|   # The most common configuration options are documented and commented below. |   config.vm.box = "debian/contrib-jessie64" | ||||||
|   # For a complete reference, please see the online documentation at |  | ||||||
|   # https://docs.vagrantup.com. |  | ||||||
| 
 |  | ||||||
|   # Every Vagrant development environment requires a box. You can search for |  | ||||||
|   # boxes at https://atlas.hashicorp.com/search. |  | ||||||
|   config.vm.box = "debian/jessie64" |  | ||||||
| 
 | 
 | ||||||
|   config.vm.hostname = "gvaldap.local" |   config.vm.hostname = "gvaldap.local" | ||||||
| 
 |  | ||||||
|   # Disable automatic box update checking. If you disable this, then |  | ||||||
|   # boxes will only be checked for updates when the user runs |  | ||||||
|   # `vagrant box outdated`. This is not recommended. |  | ||||||
|   # config.vm.box_check_update = false |  | ||||||
| 
 |  | ||||||
|   # Create a forwarded port mapping which allows access to a specific port |  | ||||||
|   # within the machine from a port on the host machine. In the example below, |  | ||||||
|   # accessing "localhost:8080" will access port 80 on the guest machine. |  | ||||||
|   config.vm.network "forwarded_port", guest: 8000, host: 8001 |  | ||||||
| 
 |  | ||||||
|   # Create a private network, which allows host-only access to the machine |  | ||||||
|   # using a specific IP. |  | ||||||
|   # config.vm.network "private_network", ip: "192.168.33.10" |  | ||||||
|   config.vm.network "private_network", ip: "172.16.3.3" |   config.vm.network "private_network", ip: "172.16.3.3" | ||||||
| 
 | 
 | ||||||
|   # Create a public network, which generally matched to bridged network. |   config.vm.network "forwarded_port", guest: 8000, host: 8001 | ||||||
|   # Bridged networks make the machine appear as another physical device on |  | ||||||
|   # your network. |  | ||||||
|   # config.vm.network "public_network" |  | ||||||
| 
 | 
 | ||||||
|   # Share an additional folder to the guest VM. The first argument is |  | ||||||
|   # the path on the host to the actual folder. The second argument is |  | ||||||
|   # the path on the guest to mount the folder. And the optional third |  | ||||||
|   # argument is a set of non-required options. |  | ||||||
|   # config.vm.synced_folder "../data", "/vagrant_data" |  | ||||||
|   config.vm.synced_folder "../gvasalt/states/", "/srv/salt/" |   config.vm.synced_folder "../gvasalt/states/", "/srv/salt/" | ||||||
|   config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/" |   config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/" | ||||||
| 
 | 
 | ||||||
|   # Provider-specific configuration so you can fine-tune various |  | ||||||
|   # backing providers for Vagrant. These expose provider-specific options. |  | ||||||
|   # Example for VirtualBox: |  | ||||||
|   # |  | ||||||
|   config.vm.provider "virtualbox" do |vb| |   config.vm.provider "virtualbox" do |vb| | ||||||
|   #   # Display the VirtualBox GUI when booting the machine |      # vb.gui = true | ||||||
|   #   vb.gui = true |  | ||||||
|   # |  | ||||||
|   #   # Customize the amount of memory on the VM: |  | ||||||
|      vb.memory = "512" |      vb.memory = "512" | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,10 @@ | ||||||
| #!/bin/sh - | #!/bin/sh - | ||||||
| 
 | 
 | ||||||
|  | echo "deb http://httpredir.debian.org/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list | ||||||
|  | 
 | ||||||
|  | apt-get update | ||||||
|  | apt-get install -y -t jessie-backports python-cryptography | ||||||
|  | 
 | ||||||
| # We just download the bootstrap script by default and execute that. | # We just download the bootstrap script by default and execute that. | ||||||
| if [ -x /usr/bin/fetch ]; then | if [ -x /usr/bin/fetch ]; then | ||||||
|     /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" |     /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue