changes for openbsd

chriswayg · Apr 8, 2020 · d87b43d · d87b43d
1 parent fbcf13e
commit d87b43d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/openbsd-6.5-x86_64-proxmox/README.md b/openbsd-6.5-x86_64-proxmox/README.md
@@ -30,7 +30,7 @@ packer --version
 - [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) 2.7.10
 
 ```
-apt -y install python3-pip
+apt -y install python3-pip sshpass
 pip3 install ansible==2.7.10
 ```
 

diff --git a/openbsd-6.5-x86_64-proxmox/openbsd-6.5-x86_64-proxmox.json b/openbsd-6.5-x86_64-proxmox/openbsd-6.5-x86_64-proxmox.json
@@ -38,7 +38,7 @@
             "template_description":"{{user `template_description`}}",
             "memory": "{{user `vm_memory`}}",
             "cores": "2",
-            "os": "l26",
+            "os": "other",
             "http_directory": "http",
 
             "node": "proxmox",
@@ -60,14 +60,14 @@
             "ssh_username": "{{user `ssh_username`}}",
             "ssh_password": "{{user `ssh_password`}}",
             "ssh_timeout": "15m",
-            "ssh_host": "10.10.10.55",
+            "ssh_host": "10.10.10.230",
             "qemu_agent": false,
             "iso_file": "local:iso/{{user `iso_filename`}}",
             "unmount_iso": true,
             "boot_wait": "30s",
             "boot_command": [
               "a<enter><wait>",
-              "<wait10>",
+              "<wait5>",
               "http://{{ .HTTPIP }}:{{ .HTTPPort }}/install.conf<enter><wait>",
               "<wait5>",
               "i<enter><wait>"

diff --git a/openbsd-6.5-x86_64-proxmox/playbook/ansible.cfg b/openbsd-6.5-x86_64-proxmox/playbook/ansible.cfg
@@ -5,3 +5,4 @@ callback_whitelist = timer, profile_roles
 stdout_callback = yaml
 roles_path = ./roles
 log_path = ./logs/server-template.log
+inventory = ./hosts
diff --git a/openbsd-6.5-x86_64-proxmox/playbook/hosts b/openbsd-6.5-x86_64-proxmox/playbook/hosts
@@ -0,0 +1,3 @@
+[servers]
+
+OpenBSD ansible_host=10.10.10.230 ansible_port=22
diff --git a/openbsd-6.5-x86_64-proxmox/playbook/requirements.yml b/openbsd-6.5-x86_64-proxmox/playbook/requirements.yml
@@ -1,2 +1,2 @@
 - src: https://github.com/chriswayg/ansible-initial-server.git
-  version: v1.4
+  #version: v1.4
diff --git a/openbsd-6.5-x86_64-proxmox/playbook/server-template.yml b/openbsd-6.5-x86_64-proxmox/playbook/server-template.yml
@@ -6,6 +6,20 @@
 # TODO: For unclear reasons, I could only get it to work with the root user in Packer
 # 'become' in playbook or role tasks seem to be ignored by Packer Ansible
 
+- name: Prepare OpenBSD for Ansible.
+  hosts: all
+  gather_facts: False
+  tasks:
+    - name: Ensure, that python is installed.
+      raw: pkg_add -z python-2.7
+      tags:
+        - openbsd
+
+    - name: Ensure, that python is linked to /usr/bin/python.
+      raw: ln -sf /usr/local/bin/python2.7 /usr/bin/python
+      tags:
+        - openbsd
+
 - name: Initial configuration of a server.
   hosts: all
   vars_files:
@@ -14,3 +28,6 @@
     - role: ansible-initial-server
       vars:
         iserver_user: "{{ vm_default_user }}"
+        iserver_become: su
+      tags:
+        - openbsd
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		[servers]

		OpenBSD ansible_host=10.10.10.230 ansible_port=22