Merge branch 'release/1.1.0'

Author: Masafumi Okamoto

.gitignore

@@ -32,3 +32,5 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+.kitchen/
+.kitchen.local.yml

.kitchen.yml

@@ -0,0 +1,42 @@
+---
+driver:
+  name: docker
+  cc_pattern: "<%= File.basename(Dir.pwd) %>"
+
+provisioner:
+  name: chef_solo
+  attributes:
+    cloudconductor:
+      servers:
+        log_sv:
+          roles: 'log'
+          private_ip: '10.0.0.1'
+      applications:
+        jpetstore:
+          type: 'dynamic'
+          protocol: 'http'
+          url: ''
+    fluentd_part:
+      roles:
+        - web
+
+platforms:
+  - name: centos-6
+    driver:
+      dockerfile: test/platforms/centos-6/Dockerfile
+
+suites:
+  - name: log_setup
+    run_list:
+      - role[log_setup]
+
+  - name: all_configure
+    run_list:
+      - role[all_configure]
+    attributes:
+
+  - name: all_deploy
+    run_list:
+      - role[all_configure]
+      - role[all_deploy]
+    attributes:

Berksfile.lock

@@ -5,12 +5,12 @@ DEPENDENCIES
     path: site-cookbooks/fluentd_part
 
 GRAPH
-  apt (2.6.1)
+  apt (2.7.0)
   cloudconductor (0.0.1)
   fluentd_part (0.0.1)
     cloudconductor (>= 0.0.0)
     td-agent (>= 0.0.0)
-  td-agent (2.0.0)
+  td-agent (2.1.0)
     apt (>= 0.0.0)
     yum (>= 0.0.0)
-  yum (3.5.3)
+  yum (3.6.3)

CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+## version 1.1.0 (2015/09/30)
+
+  - Support CloudConductor v1.1.
+  - Remove the event_handler.sh, modified to control by the Metronome (task order control tool).Therefore, add the requirements(task.yml file etc.) to control from the Metronome.
+  - Remove cloud_conductor_util gem from the required gems.
+  - Add the requirements for test run in test-kitchen.
+
 ## version 1.0.1 (2015/04/16)
 
   - Fix td-agent version to 2.1.5-1 to avoid no_writable_error in case that log output directory does not exist.

Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'cloud_conductor_utils', git: 'https://github.com/cloudconductor/cloud_conductor_utils.git'
 
 group :development do
   gem 'guard'
@@ -24,4 +23,6 @@ group :test do
   gem 'chef'
   gem 'berkshelf'
   gem 'foodcritic'
+  gem 'test-kitchen'
+  gem 'kitchen-docker'
 end