lib/kitchen/driver/ec2.rb in kitchen-ec2-2.3.4 vs lib/kitchen/driver/ec2.rb in kitchen-ec2-2.4.0
- old
+ new
@@ -23,10 +23,11 @@
require_relative "ec2_version"
require_relative "aws/client"
require_relative "aws/instance_generator"
require_relative "aws/standard_platform"
require_relative "aws/standard_platform/amazon"
+require_relative "aws/standard_platform/amazon2"
require_relative "aws/standard_platform/centos"
require_relative "aws/standard_platform/debian"
require_relative "aws/standard_platform/rhel"
require_relative "aws/standard_platform/fedora"
require_relative "aws/standard_platform/freebsd"
@@ -630,18 +631,17 @@
end
def default_windows_user_data
base_script = Kitchen::Util.outdent!(<<-EOH)
$OSVersion = (get-itemproperty -Path "HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" -Name ProductName).ProductName
- If($OSVersion.contains('2016'))
- {
- $logfile='C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
- # EC2Launch doesn't init extra disks by default
- C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeDisks.ps1
- }
- Else
- {
- $logfile='C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
+ If($OSVersion.contains('2016') -Or $OSVersion -eq 'Windows Server Datacenter') {
+ New-Item -ItemType Directory -Force -Path 'C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log'
+ $logfile='C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
+ # EC2Launch doesn't init extra disks by default
+ C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeDisks.ps1
+ } Else {
+ New-Item -ItemType Directory -Force -Path 'C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs'
+ $logfile='C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
}
# Logfile fail-safe in case the directory does not exist
New-Item $logfile -Type file -Force