Fix tp service test within docker containers (#97)

* Fix tp service test within docker containers * Updated spec tinydata
example42 · Nov 13, 2022 · fc534f4 · fc534f4
1 parent 3ea1dfb
commit fc534f4
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/data/virtual/docker.yaml b/data/virtual/docker.yaml
@@ -0,0 +1,3 @@
+---
+tp::check_service_command: 'service'
+tp::check_service_command_post: 'status'
diff --git a/hiera.yaml b/hiera.yaml
@@ -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"

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "example42-tp",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "author": "example42",
   "summary": "Tiny Puppet",
   "license": "Apache-2.0",

diff --git a/spec/tpdata/centos-7-x86_64/openssh b/spec/tpdata/centos-7-x86_64/openssh
@@ -25,3 +25,4 @@ nodaemon_args: "-D"
 validate_cmd: "sshd -t -f %"
 repo_package_provider: rpm
 init_system: systemd
+version_command: "ssh -V"
diff --git a/spec/tpdata/centos-7-x86_64/rsyslog b/spec/tpdata/centos-7-x86_64/rsyslog
@@ -26,3 +26,4 @@ process_user: root
 process_group: root
 repo_package_provider: rpm
 init_system: systemd
+version_command: "rsyslogd -v"
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/openssh b/spec/tpdata/ubuntu-16.04-x86_64/openssh
@@ -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"
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/rsyslog b/spec/tpdata/ubuntu-16.04-x86_64/rsyslog
@@ -26,3 +26,5 @@ process_user: root
 process_group: root
 repo_package_provider: dpkg
 init_system: systemd
+version_command: "rsyslogd -v"
+