Merge pull request #20 from robertdebock/openbsd

Openbsd

Author: robertdebock

README.md

@@ -44,7 +44,7 @@ bootstrap_preview: yes
 bootstrap_wait_for_host: no
 
 # The number of retries you want tasks to do before failing.
-bootstrap_retries: 10
+bootstrap_retries: 3
 
 # To update all packages installed by this roles, set `bootstrap_package_state` to `latest`.
 bootstrap_package_state: present

meta/main.yml

@@ -31,6 +31,9 @@ galaxy_info:
       versions:
         - 10.4
         - 11.2
+    - name: OpenBSD
+      version:
+        - all
     - name: OpenSUSE
       versions:
         - all
@@ -52,6 +55,7 @@ galaxy_info:
     - freebsd
     - gentoo
     - installer
+    - openbsd
     - opensuse
     - rhel
     - server

molecule/vagrant/molecule.yml

@@ -14,16 +14,18 @@ platforms:
     box: debian/stretch64
   - name: bootstrap-fedora
     box: fedora/29-cloud-base
+  - name: bootstrap-openbsd
+    box: generic/openbsd6
 provisioner:
   name: ansible
   lint:
     name: ansible-lint
   config_options:
     defaults:
       callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
+  inventory:
+    host_vars:
+      bootstrap-openbsd:
+        ansible_python_interpreter: /usr/local/bin/python3
 scenario:
   name: vagrant
-verifier:
-  name: goss
-  lint:
-    name: yamllint

tasks/main.yml

@@ -59,6 +59,14 @@
   become: no
   check_mode: no
 
+- name: register pkg_add
+  raw: pkg_info
+  register: pkg_add
+  changed_when: no
+  failed_when: no
+  become: no
+  check_mode: no
+
 - name: register yum
   raw: yum --version
   register: yum
@@ -146,6 +154,17 @@
   until: pkgresult is succeeded
   retries: "{{ bootstrap_retries }}"
 
+- name: install software with pkg_add
+  raw: pkg_add -Iz {{ bootstrap_pkg_add_packages }}
+  when:
+    - pkg_add.rc == 0
+  register: pkg_add_getresult
+  changed_when:
+    - "': ok' in pkg_add_getresult.stdout"
+  remote_user: "{{ bootstrap_user }}"
+  until: pkg_add_getresult is succeeded
+  retries: "{{ bootstrap_retries }}"
+
 - name: install software with yum
   raw: "yum -y install {{ bootstrap_yum_packages }}"
   when:

vars/main.yml

@@ -8,12 +8,19 @@ bootstrap_apt_packages: python sudo
 bootstrap_dnf_packages: python sudo
 bootstrap_emerge_packages: python sudo gentoolkit
 bootstrap_pacman_packages: python sudo
+bootstrap_pkg_add_packages: python-3* sudo--
 bootstrap_pkg_packages: python sudo
 bootstrap_yum_packages: python2 sudo
 bootstrap_zypper_packages: python python-xml sudo
 
 bootstrap_alpine_community_repo: "http://dl-cdn.alpinelinux.org/alpine/v{{ ansible_distribution_version.split('.')[0] }}.{{ ansible_distribution_version.split('.')[1] }}/community"
 
+# Some distributions do not have the fact `ansible_distribution_major_version`,
+# as a workaround it's determined here, saved to another variable and used
+# later.
+
+bootstrap_ansible_distribution_major_version: ansible_distibution_major_version | default('none')
+
 # A dictionary based on Ansible facts `ansible_distribution` and
 # `ansible_distribution_major_version` containing a list of packages.
 # This list is very similar to the `boostrap_{{ ansible_pkg_mgr }}_package`
@@ -44,6 +51,9 @@ _bootstrap_packages:
     - python
     - sudo
     - gentoolkit
+  OpenBSD:
+    - python%3
+    - sudo--
   openSUSE Leap:
     - python
     - python-xml
@@ -53,7 +63,7 @@ _bootstrap_packages:
     - python-xml
     - sudo
 
-bootstrap_packages: "{{ _bootstrap_packages[ansible_distribution ~ '-' ~ ansible_distribution_major_version] | default(_bootstrap_packages[ansible_distribution] | default(_bootstrap_packages['default'])) }}"
+bootstrap_packages: "{{ _bootstrap_packages[ansible_distribution ~ '-' ~ bootstrap_ansible_distribution_major_version] | default(_bootstrap_packages[ansible_distribution] | default(_bootstrap_packages['default'])) }}"
 
 # A dictionary based on Ansible facts `ansible_distribution` and
 # `ansible_distribution_major_version` containing a list of packages. The
@@ -82,6 +92,8 @@ _bootstrap_stable_packages:
     - polkit
     - python-devel
     - python-simplejson
+  OpenBSD:
+    - py-simplejson--
   openSUSE Leap:
     - acl
     - ca-certificates
@@ -94,7 +106,7 @@ _bootstrap_stable_packages:
     - python-apt
     - python-simplejson
 
-bootstrap_stable_packages: "{{ _bootstrap_stable_packages[ansible_distribution ~ '-' ~ ansible_distribution_major_version] | default(_bootstrap_stable_packages[ansible_distribution] | default(_bootstrap_stable_packages['default'])) }}"
+bootstrap_stable_packages: "{{ _bootstrap_stable_packages[ansible_distribution ~ '-' ~ bootstrap_ansible_distribution_major_version] | default(_bootstrap_stable_packages[ansible_distribution] | default(_bootstrap_stable_packages['default'])) }}"
 
 # A dictionary based on Ansible facts `ansible_distribution` and
 # `ansible_distribution_major_version` containing a list of packages. The
@@ -130,6 +142,8 @@ _bootstrap_preview_packages:
     - gzip
     - tar
     - unzip
+  OpenBSD:
+    - unzip--
   Ubuntu:
     - apt-transport-https
     - gzip