Skip to content

Commit

Permalink
Merge pull request #80 from TAMUArch/fixes
Browse files Browse the repository at this point in the history
v0.5.0 fixes that were found
  • Loading branch information
derekgroh committed Mar 7, 2016
2 parents 6ab0222 + 73946fc commit 8d7e0c2
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 378 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ windows_ad Cookbook
=================

[![Join the chat at https://gitter.im/TAMUArch/cookbook.windows_ad](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TAMUArch/cookbook.windows_ad?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
This cookbook installs Active Directory Domain Services on Windows Server 2012 including all necessary roles and features.
This cookbook installs Active Directory Domain Services on Windows Server including all necessary roles and features.

Requirements
============
Expand Down
20 changes: 9 additions & 11 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ win_2008_r2_box = 'opentable/win-2008r2-standard-amd64-nocm'
win_20008_r2_box_url = 'https://atlas.hashicorp.com/opentable/boxes/win-2008r2-standard-amd64-nocm'
# win_2008_r2_box = 'opentable/win-2008r2-enterprise-amd64-nocm'
# win_20008_r2_box_url = 'https://atlas.hashicorp.com/opentable/boxes/win-2008r2-enterprise-amd64-nocm'
win_2012_box = 'kensykora/windows_2012_r2_standard'
win_2012_box_url = 'https://atlas.hashicorp.com/kensykora/boxes/windows_2012_r2_standard'
win_2012_box = 'kensykora/windows_2012_standard'
win_2012_box_url = 'https://atlas.hashicorp.com/kensykora/boxes/windows_2012_standard'
win_2012_r2_box = 'opentable/win-2012r2-standard-amd64-nocm'
win_2012_r2_box_url = 'https://atlas.hashicorp.com/opentable/boxes/win-2012r2-standard-amd64-nocm'
win_2012_r2_core_box = 'kensykora/windows_2012_r2_standard_core'
Expand Down Expand Up @@ -38,9 +38,7 @@ machines = {
'rdp_port' => '8081',
'winrm_port' => '8082',
'run_list' => [
# 'recipe[test_windows_ad::setup_dc]'
'recipe[test_windows_ad::join_domain]',
'recipe[test_windows_ad::unjoin_domain]'

]
},
'win2012' => {
Expand All @@ -51,9 +49,9 @@ machines = {
'rdp_port' => '8086',
'winrm_port' => '8087',
'run_list' => [
# 'recipe[test_windows_ad::setup_dc]'
'recipe[test_windows_ad::join_domain]',
'recipe[test_windows_ad::unjoin_domain]'
'recipe[test_windows_ad::setup_forest]'
# 'recipe[test_windows_ad::join_domain]',
# 'recipe[test_windows_ad::unjoin_domain]'
]
},
'win2012r2' => {
Expand All @@ -64,9 +62,9 @@ machines = {
'rdp_port' => '8091',
'winrm_port' => '8092',
'run_list' => [
# 'recipe[test_windows_ad::setup_dc]'
'recipe[test_windows_ad::join_domain]',
'recipe[test_windows_ad::unjoin_domain]'
'recipe[test_windows_ad::setup_forest]'
# 'recipe[test_windows_ad::join_domain]',
# 'recipe[test_windows_ad::unjoin_domain]'
]
}
}
Expand Down
Binary file removed providers/.computer.rb.un~
Binary file not shown.
Binary file removed providers/.domain.rb.un~
Binary file not shown.
193 changes: 0 additions & 193 deletions providers/computer.rb~

This file was deleted.

147 changes: 0 additions & 147 deletions providers/domain.rb~

This file was deleted.

Loading

0 comments on commit 8d7e0c2

Please sign in to comment.