avoid vagrant by default
diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"
index fce735f..37cb6a3 100644
--- "a/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/.kitchen.docker.yml"
@@ -1,11 +1,12 @@
---
driver:
name: docker
- #socket: tcp://127.0.0.1:2376
hostname: {{ cookiecutter.kitchen_formula }}.ci.local
+ #socket: tcp://127.0.0.1:2376
use_sudo: false
+
provisioner:
name: salt_solo
salt_install: bootstrap
@@ -23,7 +24,38 @@
"*":
- {{ cookiecutter.kitchen_formula }}
grains:
- noservices: True
+ noservices: {{ 'True' if cookiecutter.kitchen_driver =='docker' else 'False' }}
+{%- if cookiecutter.kitchen_driver =='docker' %}
+
+
+platforms:
+ - name: ubuntu-14.04
+ - name: ubuntu-16.04
+ - name: centos-7.1
+
+
+verifier:
+ name: {{ cookiecutter.kitchen_verifier }}
+ sudo: true
+
+
+suites:
+ {%- if cookiecutter.kitchen_suites == "" %}
+ - name: default
+ # provisioner:
+ # pillars-from-files:
+ # {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/default.sls
+ {%- else %}
+ {%- for suite in cookiecutter.kitchen_suites.split() %}
+
+ - name: {{ suite }}
+ provisioner:
+ pillars-from-files:
+ {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{suite}}.sls
+ {%- endfor %}
+ {%- endif %}
+
+{%- endif %}
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.openstack.yml" "b/\173\173cookiecutter.project_name\175\175/.kitchen.openstack.yml"
index 6dbf7b2..d4c55b6 100644
--- "a/\173\173cookiecutter.project_name\175\175/.kitchen.openstack.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/.kitchen.openstack.yml"
@@ -38,4 +38,29 @@
transport:
username: <%= ENV['OS_UBUNTU_IMAGE_USER'] || 'root' %>
+{%- if cookiecutter.kitchen_driver =='openstack' %}
+
+verifier:
+ name: {{ cookiecutter.kitchen_verifier }}
+ sudo: true
+
+
+suites:
+ {%- if cookiecutter.kitchen_suites == "" %}
+ - name: default
+ # provisioner:
+ # pillars-from-files:
+ # {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/default.sls
+ {%- else %}
+ {%- for suite in cookiecutter.kitchen_suites.split() %}
+
+ - name: {{ suite }}
+ provisioner:
+ pillars-from-files:
+ {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{suite}}.sls
+ {%- endfor %}
+ {%- endif %}
+
+{%- endif %}
+
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git "a/\173\173cookiecutter.project_name\175\175/.kitchen.yml" "b/\173\173cookiecutter.project_name\175\175/.kitchen.vagrant.yml"
similarity index 85%
rename from "\173\173cookiecutter.project_name\175\175/.kitchen.yml"
rename to "\173\173cookiecutter.project_name\175\175/.kitchen.vagrant.yml"
index 96d41d6..6c75fd2 100644
--- "a/\173\173cookiecutter.project_name\175\175/.kitchen.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/.kitchen.vagrant.yml"
@@ -1,16 +1,10 @@
---
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' %}
vm_hostname: {{ cookiecutter.kitchen_formula }}.ci.local
use_sudo: false
customize:
memory: 512
-{%- endif %}
provisioner:
@@ -32,10 +26,7 @@
grains:
noservices: {{ 'True' if cookiecutter.kitchen_driver =='docker' else 'False' }}
-
-verifier:
- name: {{ cookiecutter.kitchen_verifier }}
- sudo: true
+{%- if cookiecutter.kitchen_driver =='vagrant' %}
platforms:
@@ -44,6 +35,11 @@
- name: centos-7.1
+verifier:
+ name: {{ cookiecutter.kitchen_verifier }}
+ sudo: true
+
+
suites:
{%- if cookiecutter.kitchen_suites == "" %}
- name: default
@@ -60,4 +56,6 @@
{%- endfor %}
{%- endif %}
+{%- endif %}
+
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125