Commit 23f94e3a authored by nimrod's avatar nimrod
Browse files

- Added OpenBSD 5.6 support and tests (removed %a and %c that aren't 

supported in OpenBSD 5.6, replaced with shell scripts or Ansible facts).
parent 053e7fe1

meta/main.yml

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ galaxy_info: 
  platforms:

  - name: OpenBSD

    versions:

     - 5.6

     - 5.7

     - 5.8

     - 5.9

molecule.yml

+3 −1
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ vagrant: 
  - name: virtualbox

    type: virtualbox

  platforms:

  - name: openbsd

  - name: openbsd60

    box: kaorimatz/openbsd-6.0-amd64

  - name: openbsd56

    box: tmatilai/openbsd-5.6

  instances:

  - name: ansible-role-openbsd-bootstrap

    options:

tasks/main.yml

+4 −2
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
# tasks file for ansible-role-openbsd-bootstrap



- name: Install Python

  raw: "PKG_PATH={{ openbsd_pkg_mirror }}/OpenBSD/%c/packages/%a/ /usr/sbin/pkg_add -I py-pip"

  raw: "PKG_PATH={{ openbsd_pkg_mirror }}/OpenBSD/$(uname -r)/packages/$(arch -s)/ /usr/sbin/pkg_add -Iz python-2.7"

  register: openbsd_pkg_add_python

  failed_when: "'error' in openbsd_pkg_add_python.stdout|lower"

  changed_when: "'py-pip' in openbsd_pkg_add_python.stdout"

  tags:

      - skip_ansible_lint



- name: Gather facts

  setup:
@@ -22,7 +24,7 @@ 
- name: Configure pkg

  lineinfile:

    dest: /etc/pkg.conf

    line: 'installpath = {{ openbsd_pkg_mirror }}/OpenBSD/%c/packages/%a/'

    line: 'installpath = {{ openbsd_pkg_mirror }}/OpenBSD/{{ ansible_distribution_release }}/packages/{{ ansible_architecture }}/'

    regexp: '^installpath ='

    state: present

    create: yes