Skip to content

Commit

Permalink
[bugfix] s/include/include_tasks/, requiring ansible 2.4 (#3)
Browse files Browse the repository at this point in the history
* [bugfix] s/include/include_tasks/

also:

* add openbsd-snapshot-amd64
* QA
  • Loading branch information
trombik authored Feb 14, 2018
1 parent 83808e8 commit 38b5b56
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 7 deletions.
11 changes: 11 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,17 @@ platforms:
extra_vars:
ansible_python_interpreter: '/usr/local/bin/python'

- name: openbsd-snapshot-amd64
driver:
box: trombik/ansible-openbsd-snapshot-amd64
box_check_update: false
driver_config:
ssh:
shell: '/bin/sh'
provisioner:
extra_vars:
ansible_python_interpreter: '/usr/local/bin/python'

- name: ubuntu-14.04-amd64
driver:
box: trombik/ansible-ubuntu-14.04-amd64
Expand Down
4 changes: 4 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ AllCops:
ExtraDetails: true
DisplayStyleGuide: true

# the default CacheRootDirectory is no longer `/tmp`, but a directory under
# `$HOME` and some Unix platforms use symlink to that path
AllowSymlinksInCacheRootDirectory: true

Style/StringLiterals:
# https://github.com/reallyenglish/ansible-role-example/issues/60#issuecomment-280573231
EnforcedStyle: double_quotes
Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ gem "kitchen-verifier-shell", "~> 0.2.0"
gem "rack", "~> 1.6.4" # rack 2.x requires ruby >= 2.2.2
gem "rake", "~> 11.1.2"
gem "rspec", "~> 3.4.0"
gem "rubocop", "~> 0.51.0"
gem "serverspec", "~> 2.37.2"
gem "specinfra", ">= 2.63.2" # OpenBSD's `port` is fixed in this version
gem "rspec-retry", "~> 0.5.6"
gem "rubocop", "~> 0.52.1"
gem "serverspec", "~> 2.41.1"
gem "specinfra", ">= 2.73.1"
gem "test-kitchen", "~> 1.6.0"
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ task :test do
rakefile = d + "Rakefile"
if rakefile.exist? && rakefile.file?
Dir.chdir(d) do
puts format("entering to %s", d)
puts format("entering to %<directory>s", directory: d)
begin
puts "running rake"
sh "rake"
Expand All @@ -32,7 +32,7 @@ task :clean do
rakefile = d + "Rakefile"
next unless rakefile.exist? && rakefile.file?
Dir.chdir(d) do
puts format("entering to %s", d)
puts format("entering to %<directory>s", directory: d)
begin
puts "running rake clean"
sh "rake clean"
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ galaxy_info:
description: Manages X509 public and secret keys
company: Reallyenglish
license: BSD
min_ansible_version: 2.0
min_ansible_version: 2.4
platforms:
- name: FreeBSD
versions:
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

- include_vars: "{{ ansible_os_family }}.yml"

- include: "install-{{ ansible_os_family }}.yml"
- include_tasks: "install-{{ ansible_os_family }}.yml"

- set_fact:
x509_certificate_present: "{{ x509_certificate | selectattr('state', 'match', '^present$') | list }}"
Expand Down

0 comments on commit 38b5b56

Please sign in to comment.