use systemd module to reload config; make linter happy

master
paulfantom 7 years ago
parent 3dafd33fc6
commit f6ec780a01

4
.gitignore vendored

@ -1,5 +1,9 @@
# Ignore Vagrant cache files
/.vagrant/
# Ignore molecule and pytest files
**__pycache__**
.molecule
# Ignore retry files
*.retry

@ -1,16 +0,0 @@
# Molecule managed
[defaults]
roles_path = .molecule/roles/:.molecule/../roles/:../:../../
library = .molecule/library/:library/
action_plugins = .molecule/plugins/actions/:plugins/actions/
callback_plugins = .molecule/plugins/callbacks/:plugins/callbacks/
connection_plugins = .molecule/plugins/connections/:plugins/connections/
lookup_plugins = .molecule/plugins/lookups/:plugins/lookups/
vars_plugins = .molecule/plugins/vars/:plugins/vars/
filter_plugins = .molecule/plugins/filters/:plugins/filters/
ansible_managed = Ansible managed: Do NOT edit this file manually!
nocows = 1
retry_files_enabled = False
[ssh_connection]

@ -1,5 +0,0 @@
[all]
xenial ansible_connection=docker
stretch ansible_connection=docker
jessie ansible_connection=docker
centos7 ansible_connection=docker

@ -1,30 +0,0 @@
# Molecule managed
require 'rake'
require 'rspec/core/rake_task'
require 'yaml'
require 'fileutils'
task spec: 'serverspec:all'
task default: :spec
hosts = YAML.load_file('.molecule/state.yml')['hosts']
namespace :serverspec do
task all: hosts.keys
hosts.each do |name, host|
desc "Run serverspec on #{name}"
pattern = ['spec/*_spec.rb', "spec/#{name}/*_spec.rb", "spec/hosts/#{name}/*_spec.rb"]
host['groups'].each do |group|
pattern << "spec/#{group}/*_spec.rb"
pattern << "spec/groups/#{group}/*_spec.rb"
end
RSpec::Core::RakeTask.new(name.to_sym) do |target|
puts "*** Run serverspec on #{name} ***"
ENV['TARGET_HOST'] = name
target.pattern = pattern.join(',')
end
end
end

@ -1,18 +0,0 @@
---
converged: null
created: true
default_platform: null
default_provider: null
driver: docker
driver_config: {}
hosts:
centos7:
groups: []
jessie:
groups: []
stretch:
groups: []
xenial:
groups: []
installed_deps: true
multiple_platforms: null

@ -1,7 +1,8 @@
---
- name: reload unit
become: true
command: systemctl daemon-reload
systemd:
daemon_reload: yes
when:
- ansible_service_mgr == "systemd"

@ -1,6 +1,7 @@
---
- set_fact:
- name: Compose md5 checksum
set_fact:
setup_script_checksum: "md5:{{ setup_script_md5_sum }}"
when: setup_script_md5_sum is defined and setup_script_md5_sum
@ -12,4 +13,6 @@
mode: 0755
- name: Execute docker setup script
shell: "/tmp/docker-setup.sh"
shell: "/tmp/docker-setup.sh"
tags:
- skip_ansible_lint

@ -7,5 +7,3 @@
default_docker_config:
storage-driver: vfs
log-level: info

@ -52,4 +52,3 @@ def test_packages(host):
DOCKER = 'docker-ce'
assert host.package(DOCKER).is_installed

Loading…
Cancel
Save