Merge pull request #7 from hellofresh/feature/trusty-support

PTII-273 Add ubuntu trusty support
hellofresh · Mar 7, 2018 · 1c70ac5 · 1c70ac5
2 parents e262f01 + 8e84d30
commit 1c70ac5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -6,8 +6,12 @@ driver:
 lint:
   name: yamllint
 platforms:
+  - name: ubuntu-trusty
+    image: ubuntu-upstart
+    command: /sbin/init
+    privileged: True
   - name: ubuntu-xenial
-    image: solita/ubuntu-systemd:latest
+    image: solita/ubuntu-systemd
     command: /sbin/init
     privileged: True
     capabilities:

diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -26,8 +26,14 @@ def test_sssd_service_state(host):
 
 
 def test_sshd_service_state(host):
-    assert host.service('sshd').is_enabled
-    assert host.service('sshd').is_running
+    ssh_service_name = {
+        'centos': 'sshd',
+        'ubuntu': 'ssh'
+    }
+    assert host.service(
+        ssh_service_name[host.system_info.distribution]).is_enabled
+    assert host.service(
+        ssh_service_name[host.system_info.distribution]).is_running
 
 
 def test_ssh_access(host):

diff --git a/tasks/sshd.yml b/tasks/sshd.yml
@@ -15,5 +15,10 @@
 
 - name: sshd | ensure sshd service is enabled
   service:
-    name: sshd
+    name: "{{ sssd_ldap_ssh_service }}"
     enabled: true
+
+- name: sshd | ensure sshd service is started
+  service:
+    name: "{{ sssd_ldap_ssh_service }}"
+    state: started