commit 1eac0ef576aa4b50ebe67b399397dd69e2129795
author Petr Michalec <epcim@apealive.net> Tue Jul 26 20:56:55 2016 +0200
committer Petr Michalec <epcim@apealive.net> Tue Jul 26 20:56:55 2016 +0200
tree 7133f00fa5d5e292f9d9910a7403c0d8ec6ff5b1
parent 60b1b216ab4a339ab753534b281d8a6bc85ad4ab

independent kitchen-docker file

kitchen-init.sh

diff --git a/kitchen-init.sh b/kitchen-init.sh
index 601ea58..26c5219 100755
--- a/kitchen-init.sh
+++ b/kitchen-init.sh
@@ -16,12 +16,15 @@
 
 export SOURCE_REPO_URI="https://git.tcpcloud.eu/cookiecutter-templates/cookiecutter-salt-formula/raw/master/%7B%7Bcookiecutter.project_name%7D%7D"
 
-which envtpl &> /dev/null|| pip3 install envtpl
+which envtpl &> /dev/null || {
+  echo "ERROR: missing prerequisite, install 'envtpl' first : pip install envtpl"
+  exit 1
+}
 
 # INIT
 ###################################
 test ! -e .kitchen.yml || {
-  kitchen init -D kitchen-docker -P kitchen-salt --no-create-gemfile
+  kitchen init -D kitchen-vagrant -P kitchen-salt --no-create-gemfile
   echo .kitchen >> .gitignore
   rm -rf test
   rm -f .kitchen.yml
@@ -48,8 +51,7 @@
 
 [[ "$driver" != "docker" ]] && {
   test -e .kitchen.docker.yml || \
-    driver=docker \
-    envtpl < <(curl -skL  "${SOURCE_REPO_URI}/.kitchen.yml" -- | sed 's/cookiecutter\.kitchen_//g' | head -n12 ) > .kitchen.docker.yml
+    envtpl < <(curl -skL  "${SOURCE_REPO_URI}/.kitchen.docker.yml" -- | sed 's/cookiecutter\.kitchen_//g' ) > .kitchen.docker.yml
 }
 
 test -e .kitchen.openstack.yml || \

"b/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"

diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"
index 4d0816f..fce735f 100644
--- "a/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"
@@ -1,6 +1,7 @@
 ---
 driver:
   name: docker
+  #socket: tcp://127.0.0.1:2376
   hostname: {{ cookiecutter.kitchen_formula }}.ci.local
   use_sudo: false
 

"b/\173\173cookiecutter.project_name\175\175/.kitchen.yml"

diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.yml" "b/\173\173cookiecutter.project_name\175\175/.kitchen.yml"
index b0818b0..96d41d6 100644
--- "a/\173\173cookiecutter.project_name\175\175/.kitchen.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/.kitchen.yml"
@@ -2,6 +2,7 @@
 driver:
   name: {{ cookiecutter.kitchen_driver }}
 {%- if cookiecutter.kitchen_driver == 'docker' %}
+  #socket: tcp://127.0.0.1:2376
   hostname: {{ cookiecutter.kitchen_formula }}.ci.local
   use_sudo: false
 {%- elif cookiecutter.kitchen_driver == 'vagrant' %}
@@ -59,4 +60,4 @@
   {%- endfor %}
   {%- endif %}
 
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125