Skip to content

Commit 6fc04b3

Browse files
hhhh
committedJan 22, 2013
Migrate included definitions to DRY style ala opscode/bento
1 parent 0641a13 commit 6fc04b3

29 files changed

+252
-228
lines changed
 

‎Gemfile.lock

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
GEM
2+
remote: http://rubygems.org/
3+
specs:
4+
CFPropertyList (2.0.17)
5+
libxml-ruby (>= 1.1.0)
6+
rake (>= 0.7.0)
7+
Platform (0.4.0)
8+
akami (1.2.0)
9+
gyoku (>= 0.4.0)
10+
nokogiri (>= 1.4.0)
11+
ansi (1.3.0)
12+
archive-tar-minitar (0.5.2)
13+
builder (3.1.4)
14+
childprocess (0.3.6)
15+
ffi (~> 1.0, >= 1.0.6)
16+
cucumber (1.2.1)
17+
builder (>= 2.1.2)
18+
diff-lcs (>= 1.1.3)
19+
gherkin (~> 2.11.0)
20+
json (>= 1.4.6)
21+
diff-lcs (1.1.3)
22+
em-winrm (0.5.4)
23+
eventmachine (= 1.0.0.beta.3)
24+
mixlib-log (>= 1.3.0)
25+
uuidtools (~> 2.1.1)
26+
winrm (~> 1.1.0)
27+
erubis (2.7.0)
28+
eventmachine (1.0.0.beta.3)
29+
excon (0.16.10)
30+
ffi (1.3.1)
31+
fission (0.4.0)
32+
CFPropertyList (~> 2.0.17)
33+
fog (1.9.0)
34+
builder
35+
excon (~> 0.14)
36+
formatador (~> 0.2.0)
37+
mime-types
38+
multi_json (~> 1.0)
39+
net-scp (~> 1.0.4)
40+
net-ssh (>= 2.1.3)
41+
nokogiri (~> 1.5.0)
42+
ruby-hmac
43+
formatador (0.2.4)
44+
gherkin (2.11.5)
45+
json (>= 1.4.6)
46+
grit (2.5.0)
47+
diff-lcs (~> 1.1)
48+
mime-types (~> 1.15)
49+
posix-spawn (~> 0.3.6)
50+
gssapi (1.0.3)
51+
ffi (>= 1.0.1)
52+
gyoku (1.0.0)
53+
builder (>= 2.1.2)
54+
highline (1.6.15)
55+
httpclient (2.2.0.2)
56+
httpi (0.9.7)
57+
rack
58+
i18n (0.6.1)
59+
json (1.5.4)
60+
libxml-ruby (2.4.0)
61+
little-plugger (1.1.3)
62+
log4r (1.1.10)
63+
logging (1.6.2)
64+
little-plugger (>= 1.1.3)
65+
mime-types (1.19)
66+
mixlib-log (1.4.1)
67+
multi_json (1.5.0)
68+
net-scp (1.0.4)
69+
net-ssh (>= 1.99.1)
70+
net-ssh (2.2.2)
71+
nokogiri (1.5.6)
72+
nori (1.1.4)
73+
open4 (1.3.0)
74+
popen4 (0.1.2)
75+
Platform (>= 0.4.0)
76+
open4 (>= 0.4.0)
77+
posix-spawn (0.3.6)
78+
progressbar (0.12.0)
79+
rack (1.4.4)
80+
rake (10.0.3)
81+
rspec (2.12.0)
82+
rspec-core (~> 2.12.0)
83+
rspec-expectations (~> 2.12.0)
84+
rspec-mocks (~> 2.12.0)
85+
rspec-core (2.12.2)
86+
rspec-expectations (2.12.1)
87+
diff-lcs (~> 1.1.3)
88+
rspec-mocks (2.12.1)
89+
ruby-hmac (0.4.0)
90+
ruby-vnc (1.0.1)
91+
rubyntlm (0.1.1)
92+
savon (0.9.5)
93+
akami (~> 1.0)
94+
builder (>= 2.1.2)
95+
gyoku (>= 0.4.0)
96+
httpi (~> 0.9)
97+
nokogiri (>= 1.4.0)
98+
nori (~> 1.0)
99+
wasabi (~> 1.0)
100+
thor (0.16.0)
101+
uuidtools (2.1.3)
102+
vagrant (1.0.5)
103+
archive-tar-minitar (= 0.5.2)
104+
childprocess (~> 0.3.1)
105+
erubis (~> 2.7.0)
106+
i18n (~> 0.6.0)
107+
json (~> 1.5.1)
108+
log4r (~> 1.1.9)
109+
net-scp (~> 1.0.4)
110+
net-ssh (~> 2.2.2)
111+
vagrant-windows (0.1.2)
112+
highline
113+
vagrant (~> 1.0.3)
114+
winrm (~> 1.1.1)
115+
veewee (0.3.7)
116+
ansi (~> 1.3.0)
117+
childprocess
118+
cucumber (>= 1.0.0)
119+
fission (= 0.4.0)
120+
fog (~> 1.8)
121+
grit
122+
highline
123+
i18n
124+
net-ssh (~> 2.2.0)
125+
popen4 (~> 0.1.2)
126+
progressbar
127+
rspec (~> 2.5)
128+
ruby-vnc (~> 1.0.0)
129+
thor (~> 0.15)
130+
vagrant (>= 0.9)
131+
wasabi (1.0.0)
132+
nokogiri (>= 1.4.0)
133+
winrm (1.1.2)
134+
gssapi (~> 1.0.0)
135+
httpclient (~> 2.2.0.2)
136+
logging (~> 1.6.1)
137+
nokogiri (~> 1.5.0)
138+
rubyntlm (~> 0.1.1)
139+
savon (= 0.9.5)
140+
uuidtools (~> 2.1.2)
141+
142+
PLATFORMS
143+
ruby
144+
145+
DEPENDENCIES
146+
em-winrm
147+
vagrant-windows
148+
veewee

‎definitions/.common/session.rb

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
COMMON_SESSION = {
2+
:boot_wait => "10",
3+
:cpu_count => "1",
4+
:disk_format => "VDI",
5+
:disk_size => "40960",
6+
:hostiocache => "off",
7+
:iso_download_timeout => "1000",
8+
:kickstart_port => "7122",
9+
:kickstart_timeout => "10000",
10+
:memory_size=> "384",
11+
:postinstall_timeout => "10000",
12+
:ssh_guest_port => "22",
13+
:ssh_host_port => "7222",
14+
:ssh_key => "",
15+
:ssh_login_timeout => "10000",
16+
:ssh_password => "vagrant",
17+
:ssh_user => "vagrant",
18+
:sudo_cmd => "echo '%p'|sudo -S sh '%f'",
19+
:virtualbox => {
20+
:vm_options => {
21+
:ioapic => "on",
22+
:pae => "on"
23+
}
24+
}
25+
26+
}

‎definitions/.gitignore

Whitespace-only changes.

‎definitions/windows-7-enterprise-amd64-winrm/install-vbox.bat ‎definitions/.windows/install-vbox.bat

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
# http://downloads.sourceforge.net/sevenzip/7z920.exe
33
cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer
44
cmd /c e:\VBoxWindowsAdditions-amd64.exe /S
5+
cmd /c shutdown.exe /r /t 0 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions"
6+

‎definitions/.windows/mount-validation.bat

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This is so we can pass the validation test
2+
cmd /c net use z: \\vboxsrv\veewee-validation
3+

‎definitions/.windows/session.rb

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
require File.dirname(__FILE__) + "/../.common/session.rb"
2+
3+
WINDOWS_SESSION =
4+
COMMON_SESSION.merge({ :boot_wait => "1",
5+
:boot_cmd_sequence => [''],
6+
:winrm_user => "vagrant",
7+
:winrm_password => "vagrant",
8+
:floppy_files => [
9+
"Autounattend.xml",
10+
"oracle-cert.cer"
11+
],
12+
:postinstall_files => [
13+
"install-chef.bat",
14+
"install-vbox.bat", # would be interesting to only include this on vbox
15+
"mount-validation.bat" # maybe test if we are within a vbox vm?
16+
# because this will eventually run on kvm, openstack, etc etc
17+
],
18+
:video_memory_size => '48',
19+
:sudo_cmd => "%f",
20+
:shutdown_cmd => "shutdown /s /t 10 /f /d p:4:1 /c \"Vagrant Shutdown\"" })
21+

‎definitions/windows-2008R2-serverstandard-amd64-winrm/definition.rb

-33
This file was deleted.

‎definitions/windows-2008R2-serverstandard-amd64-winrm/install-vbox.bat

-5
This file was deleted.

‎definitions/windows-2008R2-serverstandard-amd64-winrm/postinstall.sh

-74
This file was deleted.

‎definitions/windows-2008R2-serverstandard-amd64-winrm/Autounattend.xml ‎definitions/windows-2008r2-standard/Autounattend.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<Value>vagrant</Value>
109109
<PlainText>true</PlainText>
110110
</Password>
111-
<Username>vagrant</Username>
111+
<Username>administrator</Username>
112112
<Enabled>true</Enabled>
113113
</AutoLogon>
114114
<FirstLogonCommands>

‎definitions/windows-2008r2-standard/definition.rb

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
require File.dirname(__FILE__) + "/../.windows/session.rb"
3+
4+
iso_src = "http://care.dlservice.microsoft.com//dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso"
5+
6+
session = WINDOWS_SESSION.merge({
7+
:os_type_id => 'Windows2008_64',
8+
:iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-us/evalcenter/dd459137.aspx",
9+
:iso_src => iso_src,
10+
:iso_file => File.basename(iso_src),
11+
:iso_md5 => "4263be2cf3c59177c45085c0a7bc6ca5"
12+
})
13+
14+
Veewee::Session.declare session
15+
16+

‎definitions/windows-2008r2-standard/install-chef.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/install-chef.bat

‎definitions/windows-2008r2-standard/install-vbox.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/install-vbox.bat

‎definitions/windows-2008r2-standard/mount-validation.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/mount-validation.bat

‎definitions/windows-2008r2-standard/oracle-cert.cer

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/oracle-cert.cer

‎definitions/windows-7-enterprise-amd64-winrm/definition.rb

-26
This file was deleted.

‎definitions/windows-7-enterprise-amd64-winrm/install-chef.bat

-2
This file was deleted.

‎definitions/windows-7-enterprise-amd64-winrm/oracle-cert.cer

-1.37 KB
Binary file not shown.

‎definitions/windows-7-enterprise-amd64-winrm/postinstall.bat

-74
This file was deleted.

‎definitions/windows-7-enterprise-amd64-winrm/Autounattend.xml ‎definitions/windows-7-enterprise/Autounattend.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@
6767
<component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6868
<UserAccounts>
6969
<AdministratorPassword>
70-
<Value>ZABnAEIAaABBAEcAYwBBAGMAZwBCAGgAQQBHADQAQQBkAEEAQgBRAEEARwBFAEEAYwB3AEIAegBBAEgAYwBBAGIAdwBCAHkAQQBHAFEAQQBBAGQAbQBpAG4AaQBzAHQAcgBhAHQAbwByAFAAYQBzAHMAdwBvAHIAZAA=</Value>
71-
<PlainText>false</PlainText>
70+
<Value>vagrant</Value>
71+
<PlainText>true</PlainText>
7272
</AdministratorPassword>
7373
<LocalAccounts>
7474
<LocalAccount wcm:action="add">
7575
<Password>
76-
<Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value>
77-
<PlainText>false</PlainText>
76+
<Value>vagrant</Value>
77+
<PlainText>true</PlainText>
7878
</Password>
7979
<Description>Vagrant User</Description>
8080
<DisplayName>vagrant</DisplayName>
@@ -91,8 +91,8 @@
9191
</OOBE>
9292
<AutoLogon>
9393
<Password>
94-
<Value>dgBhAGcAcgBhAG4AdABQAGEAcwBzAHcAbwByAGQA</Value>
95-
<PlainText>false</PlainText>
94+
<Value>vagrant</Value>
95+
<PlainText>true</PlainText>
9696
</Password>
9797
<Username>vagrant</Username>
9898
<Enabled>true</Enabled>

‎definitions/windows-7-enterprise-amd64-winrm/README.md ‎definitions/windows-7-enterprise/README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ one of the names listed in the sources/install.wim on the install DVD .iso
4343

4444

4545

46-
# Use the Name : from 'Dism.exe /Get-WIMInfo /WimFile:d:\sources\install.wim'
47-
# <InstallFrom>
48-
# <MetaData wcm:action="add">
49-
# <Key>/IMAGE/NAME</Key>
50-
# <Value>Windows 7 ENTERPRISE</Value>
51-
# </MetaData>
52-
# </InstallFrom>
46+
# Use the Name : from 'Dism.exe /Get-WIMInfo /WimFile:d:\sources\install.wim'
47+
# <InstallFrom>
48+
# <MetaData wcm:action="add">
49+
# <Key>/IMAGE/NAME</Key>
50+
# <Value>Windows 7 ENTERPRISE</Value>
51+
# </MetaData>
52+
# </InstallFrom>

‎definitions/windows-7-enterprise/definition.rb

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# -*- coding: utf-8 -*-
2+
require File.dirname(__FILE__) + "/../.windows/session.rb"
3+
4+
iso_src = "http://wb.dlservice.microsoft.com/dl/download/release/Win7/3/b/a/3bac7d87-8ad2-4b7a-87b3-def36aee35fa/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso"
5+
6+
session = WINDOWS_SESSION.merge({
7+
:os_type_id => 'Windows7_64',
8+
:iso_download_instructions => "Download Windows 7 Enterprise 90-day Trial at http://technet.microsoft.com/en-us/evalcenter/cc442495.aspx",
9+
:iso_file => File.basename(iso_src),
10+
:iso_src => iso_src,
11+
:iso_md5 => "1d0d239a252cb53e466d39e752b17c28"
12+
})
13+
14+
Veewee::Session.declare session

‎definitions/windows-7-enterprise/install-chef.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/install-chef.bat

‎definitions/windows-7-enterprise/install-vbox.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/install-vbox.bat

‎definitions/windows-7-enterprise/mount-validation.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/mount-validation.bat

‎definitions/windows-7-enterprise/oracle-cert.cer

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.windows/oracle-cert.cer

0 commit comments

Comments
 (0)
Please sign in to comment.