diff --git a/base-boxes/base-centos/Vagrantfile b/base-boxes/base-centos/Vagrantfile index 986ac83653c6b8f9143cae0ad560708cc215d9b5..e000dbd694e0045d29f777194ae05e275e645770 100644 --- a/base-boxes/base-centos/Vagrantfile +++ b/base-boxes/base-centos/Vagrantfile @@ -27,7 +27,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # 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", hostname: "vm", virtualbox__intnet: "vboxnet0" + config.vm.network "private_network", ip: "192.168.33.10", hostname: "vm", virtualbox__intnet: "localDev" config.ssh.insert_key = false diff --git a/base-boxes/base-winsvr2012/Vagrantfile b/base-boxes/base-winsvr2012/Vagrantfile index 0d5b1381752edda7345c38917ee2bc84c53c3255..9adc3b56887a898b6b001a9b132ad6a93f8b67c8 100644 --- a/base-boxes/base-winsvr2012/Vagrantfile +++ b/base-boxes/base-winsvr2012/Vagrantfile @@ -1,10 +1,15 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : +Vagrant.require_version ">= 1.9.1" + +required_plugins = %w( winrm winrm-fs) + +required_plugins.each do |plugin| + system "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin +end Vagrant.configure("2") do |config| - config.vm.box = "base-winsvr2012" - #config.vm.box_url = "file:///home/cpb113/base_vagrant/psu_winsvr2012_baseBox_1_0_0.tar.gz" - config.vm.box_url = "https://nexus.ci.psu.edu/repository/vagrant-boxes/base-winsvr2012.json" + config.vm.box = "edu.psu/base-winsvr2012" + config.vm.box_url = "file:///home/cpb113/base-vagrant/psu_winsvr2012_basebox_1_0_0.tar.gz" + #config.vm.box_url = "https://nexus.ci.psu.edu/repository/vagrant-boxes/base-winsvr2012.json" config.winrm.username = "vagrant" config.winrm.password = "P@ssw0rd" @@ -12,7 +17,7 @@ Vagrant.configure("2") do |config| config.vm.network "forwarded_port", guest: 3389, host: 3389 - config.vm.network "private_network", ip: "192.168.33.11", virtualbox__intnet: "vboxnet0" + config.vm.network "private_network", ip: "192.168.33.11", virtualbox__intnet: "localDev" config.ssh.insert_key = false @@ -25,11 +30,11 @@ Vagrant.configure("2") do |config| end # Enable provisioning with Ansible - config.vm.provision :ansible do |ansible| - ansible.playbook = "playbook.yml" - ansible.groups = { - "vagrant" => ["default"], - } - end + #config.vm.provision :ansible do |ansible| + # ansible.playbook = "playbook.yml" + # ansible.groups = { + # "vagrant" => ["default"], + # } + #end end diff --git a/roles/ActiveDirectory/tasks/main.yml b/roles/ActiveDirectory/tasks/main.yml index 4217a9b5bbc71dc78f66b5ef650d1f9f732de1f6..71e5458953c24ea9d245f59b29be70aa7cb17a0e 100644 --- a/roles/ActiveDirectory/tasks/main.yml +++ b/roles/ActiveDirectory/tasks/main.yml @@ -27,4 +27,4 @@ - name: wait for reboot local_action: wait_for - args: host={{ inventory_hostname }} port=5985 delay=1 timeout=120 state=started \ No newline at end of file + args: host={{ inventory_hostname }} port=5985 delay=1 timeout=120 state=started