Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fae5af4

Browse files
committed
Compatibility for ubuntu xenial 16.04
Replace deprecated cookbook awscli by cloudcli
1 parent 202a442 commit fae5af4

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

‎.kitchen.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
---
22
driver:
33
name: docker
4-
port: 2222
4+
binary: docker
5+
use_sudo: false
6+
privileged: true
57

68
provisioner:
79
name: chef_solo
810

911
platforms:
12+
- name: ubuntu-16.04
13+
driver_config:
14+
image: ubuntu:16.04
1015
- name: ubuntu-14.04
1116
driver_config:
1217
image: ubuntu:14.04

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ gem 'berkshelf'
1717
gem 'test-kitchen'
1818
gem 'kitchen-vagrant'
1919
gem 'kitchen-ec2'
20+
gem 'kitchen-docker'
2021
gem 'serverspec'

‎definitions/manual_installer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include_recipe 'build-essential'
55
include_recipe 'rbenv::default'
66
include_recipe 'rbenv::ruby_build'
7-
include_recipe 'awscli'
7+
include_recipe 'cloudcli'
88

99
ark 'download-codedeploy' do
1010
url 'https://github.com/aws/aws-codedeploy-agent/archive/master.zip'

‎definitions/ubuntu_installer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define :ubuntu_installer do
22

3-
include_recipe 'awscli'
3+
include_recipe 'cloudcli'
44

55
remote_file "#{Chef::Config[:file_cache_path]}/codedeploy-agent_all.deb" do
66
source 'https://s3.amazonaws.com/aws-codedeploy-us-east-1/latest/codedeploy-agent_all.deb'

‎metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
depends 'ohai'
1515
depends 'build-essential'
1616
depends 'rbenv'
17-
depends 'awscli'
17+
depends 'cloudcli'
1818
depends 'ark', '= 0.9.0'

‎recipes/default.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
end
2929

3030
case node['platform_version']
31+
when '16.04'
32+
%w(unzip rsync ruby2.3).each do |pkg|
33+
package pkg
34+
end
35+
manual_installer
3136
when '14.04'
3237
%w(unzip rsync ruby2.0).each do |pkg|
3338
package pkg

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /