Skip to content

Commit 495447d

Browse files
authored
Merge pull request #62 from mengesb/v2.0.2
Release v2.0.2
2 parents 1b28386 + 70d39cd commit 495447d

6 files changed

Lines changed: 124 additions & 2 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ terraform.tfvars
44
*.swp*
55
.chef
66
!.chef/.gitkeep
7+
.kitchen
78
logfiles

.kitchen.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
driver:
3+
name: terraform
4+
5+
provisioner:
6+
name: terraform
7+
apply_timeout: 1000
8+
color: true
9+
variable_files:
10+
- terraform.tfvars
11+
12+
platforms:
13+
- name: centos-7
14+
15+
transport:
16+
name: ssh
17+
ssh_key: ~/.ssh/chef_provisioning
18+
19+
verifier:
20+
name: terraform
21+
format: doc
22+
groups:
23+
- name: default
24+
tests:
25+
- operating_system
26+
- chef_server
27+
hostnames: public_ip
28+
username: ubuntu
29+
30+
suites:
31+
- name: default

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ tf_chef_server CHANGELOG
33

44
This file is used to list changes made in each version of the tf_chef_server Terraform plan.
55

6+
v2.0.2 (2016-11-18)
7+
-------------------
8+
- [Julian Dunn] - Fix [terraform.tfvars.example] missing double quote
9+
- [Julian Dunn] - Stringify the booleans (hashicorp/terraform#9751)
10+
- [Brian Menges] - Update chef client and server versions to latest
11+
- [Brian Menges] - Add kitchen-terraform and tests
12+
613
v2.0.0 (2016-10-13)
714
-------------------
815
- [Brian Menges] - Add missing dependent cookbook to [files/chef-cookbooks.sh]
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
describe port(443) do
2+
it { should be_listening }
3+
its('protocols') { should include 'tcp' }
4+
end
5+
6+
describe port(80) do
7+
it { should be_listening }
8+
its('protocols') { should include 'tcp' }
9+
end
10+
11+
describe port(4321) do
12+
it { should be_listening }
13+
its('protocols') { should include 'tcp' }
14+
end
15+
16+
describe port(9683) do
17+
it { should be_listening }
18+
its('protocols') { should include 'tcp' }
19+
end
20+
21+
describe port(9463) do
22+
it { should be_listening }
23+
its('protocols') { should include 'tcp' }
24+
end
25+
26+
describe port(9090) do
27+
it { should be_listening }
28+
its('protocols') { should include 'tcp' }
29+
end
30+
31+
describe port(8000) do
32+
it { should be_listening }
33+
its('protocols') { should include 'tcp' }
34+
end
35+
36+
describe port(5432) do
37+
it { should be_listening }
38+
its('protocols') { should include 'tcp' }
39+
end
40+
41+
describe port(5672) do
42+
it { should be_listening }
43+
its('protocols') { should include 'tcp' }
44+
end
45+
46+
describe port(16379) do
47+
it { should be_listening }
48+
its('protocols') { should include 'tcp' }
49+
end
50+
51+
describe package('chef-server-core') do
52+
it { should be_installed }
53+
its('version') { should eq '12.11.1-1' }
54+
end
55+
56+
describe package('chef') do
57+
it { should be_installed }
58+
its('version') { should eq '12.16.42-1' }
59+
end
60+
61+
describe package('chef-manage') do
62+
it { should be_installed }
63+
its('version') { should eq '2.4.4-1' }
64+
end
65+
66+
describe file('/etc/opscode/chef-server.rb') do
67+
it { should be_file }
68+
it { should be_owned_by 'root' }
69+
its('content') { should match(%r{^topology "standalone"$}) }
70+
end
71+
72+
describe file('/var/opt/chef-manage/.license.accepted') do
73+
it { should exist }
74+
its('size') { should be 0 }
75+
end
76+
77+
describe file('/var/opt/opscode-reporting/.license.accepted') do
78+
it { should exist }
79+
its('size') { should be 0 }
80+
end
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
describe os[:family] do
2+
it { should eq 'debian' }
3+
end

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ variable "chef_versions" {
143143
type = "map"
144144
description = "Chef software versions"
145145
default = {
146-
client = "12.15.19"
147-
server = "12.9.1"
146+
client = "12.16.42"
147+
server = "12.11.1"
148148
}
149149
}
150150
variable "instance" {

0 commit comments

Comments
 (0)