diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index e74ec32..2e2ac18 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -53,7 +53,3 @@ sway_conf_files: wireguard_directory: odo enabled_wireguard: - wgh -poudriere_builds: - - jail: current - ports: default - set: framework diff --git a/ansible/environments/vm/host_vars/poudriereodo b/ansible/environments/vm/host_vars/poudriereodo new file mode 100644 index 0000000..ac36095 --- /dev/null +++ b/ansible/environments/vm/host_vars/poudriereodo @@ -0,0 +1,5 @@ +os_flavor: "freebsd" +poudriere_builds: + - jail: 13amd64 + ports: default + set: framework diff --git a/ansible/environments/vm/hosts b/ansible/environments/vm/hosts new file mode 100644 index 0000000..9213441 --- /dev/null +++ b/ansible/environments/vm/hosts @@ -0,0 +1,2 @@ +[vm] +poudriereodo ansible_user=builder ansible_host=10.213.177.11 diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml index 3cba5ab..d4f4ef6 100644 --- a/ansible/playbook.yaml +++ b/ansible/playbook.yaml @@ -1,4 +1,4 @@ -- hosts: all:!jail +- hosts: all:!jail:!vm vars: ansible_become: True roles: @@ -37,10 +37,17 @@ # - ansible # - wireguard # - portshaker - - poudriere + # - poudriere - hosts: nat_dhcp:homeserver_nat_dhcp vars: ansible_become: True roles: - jail_nat_dhcp + +- hosts: poudriereodo + vars: + ansible_become: True + roles: + - portshaker + - poudriere diff --git a/ansible/run.bash b/ansible/run.bash index 2f37517..2d7eba8 100755 --- a/ansible/run.bash +++ b/ansible/run.bash @@ -26,7 +26,8 @@ elif [ "$target" = "jail_nat_dhcp" ]; then ansible-playbook -v -i environments/jail playbook.yaml --diff --limit nat_dhcp "${@}" elif [ "$target" = "jail_homeserver_nat_dhcp" ]; then ansible-playbook -v -i environments/jail playbook.yaml --diff --limit homeserver_nat_dhcp "${@}" - # +elif [ "$target" = "vm_poudriereodo" ]; then + ansible-playbook -v -i environments/vm playbook.yaml --diff --limit poudriereodo "${@}" else die 1 "Unrecognized target" fi