Adjustments to OpenBSD bootstrap to run on both platforms.

handlers/main.yml

@@ -16,7 +16,7 @@
 
 - name: Restart ssh
   service:
-    name: ssh
+    name: '{{ ssh_daemon[ansible_os_family] }}'
     state: restarted
 
 - name: Restart Collectd

tasks/lock_root.yml

@@ -3,7 +3,7 @@
 - name: Disable root account
   user:
     name: root
-    password: ''
+    password: '*************'
   register: lock_root
   changed_when: not (lock_root.stderr is defined and 'no changes' in lock_root.stderr)
 

tasks/openbsd_bootstrap.yml

@@ -7,11 +7,10 @@
   changed_when: "'python' in openbsd_pkg_add_python.stdout"
 
 - name: Symlink python
-  file:
-    path: /usr/bin/python
-    src: /usr/local/bin/python2.7
-    state: link
-    force: yes
+  raw: ln -s /usr/local/bin/python2.7 /usr/bin/python
+  register: symlink_python
+  changed_when: not 'File exists' in symlink_python.stderr
+  failed_when: symlink_python|failed and not 'File exists' in symlink_python.stdout_lines[0]
 
 - name: Gather facts
   setup:

vars/main.yml

@@ -32,10 +32,12 @@ openbsd_collectd_version:
     '5.8': 'collectd-5.5.0p1'
 
 openbsd_pkg_mirror: http://www.mirrorservice.org/pub
-ansible_python_interpreter: '{{ "/usr/local/bin/python2.7" if openbsd_bootstrap is defined else omit }}'
 update_ca_certificates:
     OpenBSD: /usr/local/sbin/update-ca-certificates
     Debian: /usr/sbin/update-ca-certificates
 ca_store:
     OpenBSD: /etc/ssl/cert.pem
     Debian: /etc/ssl/certs/ca-certificates.crt
+ssh_daemon:
+    OpenBSD: sshd
+    Debian: ssh