Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tp service test within docker containers #97

Merged
merged 2 commits into from
Nov 13, 2022
Merged

Fix tp service test within docker containers #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd9b031
Fix tp service test within docker containers
alvagante Nov 13, 2022
8522902
Updated spec tinydata
alvagante Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 3.5.3

- Fix tp service test within docker containers

## 3.5.2

- Fixed idempotency in keys management when tp::apt_safe_trusted_key is true
Expand Down
3 changes: 3 additions & 0 deletions data/virtual/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
tp::check_service_command: 'service'
tp::check_service_command_post: 'status'
1 change: 1 addition & 0 deletions hiera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ defaults:
hierarchy:
- name: "In module hierarchy"
paths:
- "virtual/%{facts.virtual}.yaml"
- "%{facts.os.name}%{facts.os.release.major}.yaml"
- "%{facts.os.name}.yaml"
- "%{facts.os.family}%{facts.os.release.major}.yaml"
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example42-tp",
"version": "3.5.2",
"version": "3.5.3",
"author": "example42",
"summary": "Tiny Puppet",
"license": "Apache-2.0",
Expand Down
1 change: 1 addition & 0 deletions spec/tpdata/centos-7-x86_64/openssh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ nodaemon_args: "-D"
validate_cmd: "sshd -t -f %"
repo_package_provider: rpm
init_system: systemd
version_command: "ssh -V"
1 change: 1 addition & 0 deletions spec/tpdata/centos-7-x86_64/rsyslog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ process_user: root
process_group: root
repo_package_provider: rpm
init_system: systemd
version_command: "rsyslogd -v"
1 change: 1 addition & 0 deletions spec/tpdata/ubuntu-16.04-x86_64/openssh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ init_file_path: "/var/default/ssh"
validate_cmd: "sshd -t -f %"
repo_package_provider: dpkg
init_system: systemd
version_command: "ssh -V"
2 changes: 2 additions & 0 deletions spec/tpdata/ubuntu-16.04-x86_64/rsyslog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ process_user: root
process_group: root
repo_package_provider: dpkg
init_system: systemd
version_command: "rsyslogd -v"