[ansible/docker] Fix HiveMind due to requests change

OpenVoiceOS · Jul 12, 2024 · 3bc7e22 · 3bc7e22
1 parent 89366c4
commit 3bc7e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/ansible/roles/ovos_installer/tasks/docker/composer.yml b/ansible/roles/ovos_installer/tasks/docker/composer.yml
@@ -99,16 +99,11 @@
     DOCKER_TIMEOUT: "900"
 
 - name: Generate _identity.json
+  become: true
+  become_user: "{{ ovos_installer_user }}"
   community.docker.docker_container_exec:
     container: hivemind_cli
-    command: |
-      hivemind-client set-identity \
-        --key {{ ovos_installer_satellite_key }} \
-        --password {{ ovos_installer_satellite_password }} \
-        --host {{ ovos_installer_listener_host }} \
-        --port {{ ovos_installer_listener_port | default(5678) }} \
-        --siteid {{ ovos_installer_site_id | default("voice-sat-1") }}
-  changed_when: false
+    command: hivemind-client set-identity --key {{ ovos_installer_satellite_key }} --password {{ ovos_installer_satellite_password }} --host {{ ovos_installer_listener_host }} --port {{ ovos_installer_listener_port | default(5678) }} --siteid {{ ovos_installer_site_id | default("voice-sat-1") }}
   when: ovos_installer_profile == "satellite"
 
 - name: Block uninstall composer

diff --git a/utils/common.sh b/utils/common.sh
@@ -265,7 +265,7 @@ function install_ansible() {
     echo -ne "➤ Installing Ansible requirements in Python virtualenv... "
     ANSIBLE_VERSION="9.2.0"
     [ "$(ver "$PYTHON")" -lt "$(ver 3.10)" ] && ANSIBLE_VERSION="8.7.0"
-    pip3 install ansible=="$ANSIBLE_VERSION" docker==7.1.0 &>>"$LOG_FILE"
+    pip3 install ansible=="$ANSIBLE_VERSION" docker==7.1.0 requests==2.31.0 &>>"$LOG_FILE"
     ansible-galaxy collection install -r ansible/requirements.yml &>>"$LOG_FILE"
     echo -e "[$done_format]"
 }