more ansible fixes

archivebox/builtin_plugins/ansible/roles/install_packages/tasks/main.yml

@@ -1,58 +0,0 @@
-#!/usr/bin/env ansible-playbook
----
-# - name: "Install using apt/brew/pkg/yum/etc."
-#   hosts: localhost
-#   gather_facts: no
-#   vars:
-#     DATA_DIR: '/Volumes/NVME/Users/squash/Code/archiveboxes/archivebox7/data4'
-#     LIB_DIR: '{{DATA_DIR}}/lib'
-#     LIB_DIR_BIN: '{{LIB_DIR}}/bin'
-#     state: 'present'
-#     install_packages: {}
-#       # bash:
-#       #   packages: ['bash']
-#     PACKAGE_BINPROVIDERS: {}
-#     PACKAGE_BINARIES: {}
-#     BINPROVIDERS: {}
-#   tasks:
-# - package: update_cache=yes
-  # when: ansible_facts['os_family'] == "Debian"
-
-- name: Make sure lib folders exist
-  file:
-    path: '{{LIB_DIR_BIN}}'
-    state: directory
-    recurse: true
-  when: BINPROVIDERS.ansible_package is not defined
-
-- name: Get ansible binary abspath
-  command: 'which ansible'
-  register: ANSIBLE_INSTALLER_ABSPATH_FULL
-  changed_when: false
-  when: BINPROVIDERS.ansible_package is not defined
-
-###################################################################################
-- name: "Install system packages: {{all_packages}}"
-  ansible.builtin.package:
-    name: "{{item}}"
-    state: "{{state}}"
-  loop: "{{all_packages}}"
-
-###################################################################################
-
-- set_fact:
-    PACKAGE_BINPROVIDERS:
-      ansible_package:
-        installer_abspath: "{{ANSIBLE_INSTALLER_ABSPATH_FULL.stdout}}"
-        installer_version: "{{ansible_version.full}}"
-        PATH: "/opt/homebrew/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-  when: BINPROVIDERS.ansible_package is not defined
-
-- set_fact:
-    BINPROVIDERS: "{{ BINPROVIDERS | default({}) | combine(PACKAGE_BINPROVIDERS) }}"
-    cacheable: true
-  when: BINPROVIDERS.ansible_package is not defined
-
-- debug:
-    msg: "{{ {'BINPROVIDERS': BINPROVIDERS} }}"
-

archivebox/builtin_plugins/ansible/roles/install_packages/vars/main.yml

@@ -1,5 +0,0 @@
-DATA_DIR: '{{playbook_dir}}'
-LIB_DIR: '{{DATA_DIR}}/lib'
-LIB_DIR_BIN: '{{LIB_DIR}}/bin'
-state: present
-all_packages: []

archivebox/builtin_plugins/ansible/roles/load_binary/tasks/main.yml

@@ -32,7 +32,8 @@
 
 - name: 'Updating BINARIES with loaded abspaths & versions: {{name}}'
   set_fact:
-    BINARIES: "{{      BINARIES
+    BINARIES: "{{
+      BINARIES
       | default({})
       | combine({
           name: {

archivebox/builtin_plugins/ansible/roles/setup_lib_pip/tasks/main.yml

@@ -10,7 +10,7 @@
   when: BINPROVIDERS.pip is not defined
 
 - name: Load Python and Pip binaries
-  import_role:
+  include_role:
     name: load_binary
   vars:
     name: '{{item}}'
@@ -53,7 +53,17 @@
 - set_fact:
     BINPROVIDERS: "{{ BINPROVIDERS | default({}) | combine(PIP_BINPROVIDERS) }}"
     cacheable: true
-  when: BINPROVIDERS.pip is not defined
+  changed_when: False
+
+- name: Load Python and Pip binaries from venv
+  include_role:
+    name: load_binary
+  vars:
+    name: '{{item}}'
+    PATH: '{{BINPROVIDERS.pip.PATH}}'
+  loop:
+    - python
+    - pip
 
 - debug:
     msg: "{{ {'BINARIES': BINARIES, 'BINPROVIDERS': BINPROVIDERS} }}"