diff --git a/jcloud/playbooks/roles/agent/tasks/main.yml b/jcloud/playbooks/roles/agent/tasks/main.yml index d231b17..0e50176 100644 --- a/jcloud/playbooks/roles/agent/tasks/main.yml +++ b/jcloud/playbooks/roles/agent/tasks/main.yml @@ -53,28 +53,28 @@ - name: Generate Agent Configuration File become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined and proxy_ip is truthy %}--proxy-ip {{ proxy_ip }}{% endif %} {% if agent_sentry_dsn is defined and agent_sentry_dsn is truthy %}--sentry-dsn {{ agent_sentry_dsn }}{% endif %}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined and proxy_ip is truthy %}--proxy-ip {{ proxy_ip }}{% endif %} {% if agent_sentry_dsn is defined and agent_sentry_dsn is truthy %}--sentry-dsn {{ agent_sentry_dsn }}{% endif %}' args: chdir: /home/jingrow/agent - name: Setup Agent SQLite Database become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup database + command: /home/jingrow/agent/env/bin/python -m agent.cli setup database args: chdir: /home/jingrow/agent - name: Setup Agent Usage Tracker become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup usage + command: /home/jingrow/agent/env/bin/python -m agent.cli setup usage args: chdir: /home/jingrow/agent - name: Setup Agent Site Analytics Tracker become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup site-analytics + command: /home/jingrow/agent/env/bin/python -m agent.cli setup site-analytics args: chdir: /home/jingrow/agent @@ -88,7 +88,7 @@ - name: Setup Agent Authentication become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup authentication --password {{ agent_password }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup authentication --password {{ agent_password }}' args: chdir: /home/jingrow/agent @@ -110,7 +110,7 @@ - name: Setup Agent Supervisor become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup supervisor + command: /home/jingrow/agent/env/bin/python -m agent.cli setup supervisor args: chdir: /home/jingrow/agent @@ -175,7 +175,7 @@ - name: Setup Agent NGINX become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup nginx + command: /home/jingrow/agent/env/bin/python -m agent.cli setup nginx args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/agent_rename/tasks/main.yml b/jcloud/playbooks/roles/agent_rename/tasks/main.yml index 4c90215..0dd4929 100644 --- a/jcloud/playbooks/roles/agent_rename/tasks/main.yml +++ b/jcloud/playbooks/roles/agent_rename/tasks/main.yml @@ -2,21 +2,21 @@ - name: Generate Agent Configuration File become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined %}--proxy-ip {{ proxy_ip }}{% endif %}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined %}--proxy-ip {{ proxy_ip }}{% endif %}' args: chdir: /home/jingrow/agent - name: Setup Agent Authentication become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup authentication --password {{ agent_password }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup authentication --password {{ agent_password }}' args: chdir: /home/jingrow/agent - name: Setup Agent Supervisor become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup supervisor + command: /home/jingrow/agent/env/bin/python -m agent.cli setup supervisor args: chdir: /home/jingrow/agent @@ -44,7 +44,7 @@ - name: Setup Agent NGINX become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup nginx + command: /home/jingrow/agent/env/bin/python -m agent.cli setup nginx args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/agent_sentry/tasks/main.yml b/jcloud/playbooks/roles/agent_sentry/tasks/main.yml index da1e5d4..d30cc9b 100644 --- a/jcloud/playbooks/roles/agent_sentry/tasks/main.yml +++ b/jcloud/playbooks/roles/agent_sentry/tasks/main.yml @@ -2,6 +2,6 @@ - name: Setup Agent Sentry become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup sentry --sentry-dsn {{ agent_sentry_dsn }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup sentry --sentry-dsn {{ agent_sentry_dsn }}' args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/agent_set_proxy_ip/tasks/main.yml b/jcloud/playbooks/roles/agent_set_proxy_ip/tasks/main.yml index 13058c0..ca44cac 100644 --- a/jcloud/playbooks/roles/agent_set_proxy_ip/tasks/main.yml +++ b/jcloud/playbooks/roles/agent_set_proxy_ip/tasks/main.yml @@ -2,20 +2,20 @@ - name: Generate Agent Configuration File become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined %}--proxy-ip {{ proxy_ip }}{% endif %}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined %}--proxy-ip {{ proxy_ip }}{% endif %}' args: chdir: /home/jingrow/agent - name: Setup Agent Authentication become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup authentication --password {{ agent_password }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup authentication --password {{ agent_password }}' args: chdir: /home/jingrow/agent - name: Setup Agent NGINX become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup nginx + command: /home/jingrow/agent/env/bin/python -m agent.cli setup nginx args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/prometheus/tasks/main.yml b/jcloud/playbooks/roles/prometheus/tasks/main.yml index 9297a21..b5f79fb 100644 --- a/jcloud/playbooks/roles/prometheus/tasks/main.yml +++ b/jcloud/playbooks/roles/prometheus/tasks/main.yml @@ -119,7 +119,7 @@ - name: Setup Agent Based Discovery become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup monitor --url {{ jcloud_url }} --token {{ monitor_token }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup monitor --url {{ jcloud_url }} --token {{ monitor_token }}' args: chdir: /home/jingrow/agent @@ -128,4 +128,4 @@ become_user: jingrow cron: name: agent discovery - job: cd /home/jingrow/agent && /home/jingrow/agent/env/bin/agent discover + job: cd /home/jingrow/agent && /home/jingrow/agent/env/bin/python -m agent.cli discover diff --git a/jcloud/playbooks/roles/proxy/tasks/main.yml b/jcloud/playbooks/roles/proxy/tasks/main.yml index d85dd33..24be52b 100644 --- a/jcloud/playbooks/roles/proxy/tasks/main.yml +++ b/jcloud/playbooks/roles/proxy/tasks/main.yml @@ -31,6 +31,6 @@ - name: Setup Agent Proxy become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup proxy --domain {{ domain }} --jcloud-url {{ jcloud_url }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup proxy --domain {{ domain }} --jcloud-url {{ jcloud_url }}' args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/proxysql/tasks/main.yml b/jcloud/playbooks/roles/proxysql/tasks/main.yml index 4c00abf..2020b39 100644 --- a/jcloud/playbooks/roles/proxysql/tasks/main.yml +++ b/jcloud/playbooks/roles/proxysql/tasks/main.yml @@ -63,6 +63,6 @@ - name: Setup Agent ProxySQL become: yes become_user: jingrow - command: "/home/jingrow/agent/env/bin/agent setup proxysql --password {{ proxysql_admin_password }}" + command: "/home/jingrow/agent/env/bin/python -m agent.cli setup proxysql --password {{ proxysql_admin_password }}" args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/registry/tasks/main.yml b/jcloud/playbooks/roles/registry/tasks/main.yml index 84223b9..b862d6e 100644 --- a/jcloud/playbooks/roles/registry/tasks/main.yml +++ b/jcloud/playbooks/roles/registry/tasks/main.yml @@ -37,6 +37,6 @@ - name: Setup NGINX for Registry become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup registry + command: /home/jingrow/agent/env/bin/python -m agent.cli setup registry args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/sentry/tasks/main.yml b/jcloud/playbooks/roles/sentry/tasks/main.yml index 74edee4..ae4c227 100644 --- a/jcloud/playbooks/roles/sentry/tasks/main.yml +++ b/jcloud/playbooks/roles/sentry/tasks/main.yml @@ -85,6 +85,6 @@ - name: Setup NGINX Proxy for Sentry become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup trace + command: /home/jingrow/agent/env/bin/python -m agent.cli setup trace args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/standalone/tasks/main.yml b/jcloud/playbooks/roles/standalone/tasks/main.yml index 84415e6..1659cb2 100644 --- a/jcloud/playbooks/roles/standalone/tasks/main.yml +++ b/jcloud/playbooks/roles/standalone/tasks/main.yml @@ -16,6 +16,6 @@ - name: Setup Agent Standalone become: yes become_user: jingrow - command: '/home/jingrow/agent/env/bin/agent setup standalone --domain {{ domain }}' + command: '/home/jingrow/agent/env/bin/python -m agent.cli setup standalone --domain {{ domain }}' args: chdir: /home/jingrow/agent diff --git a/jcloud/playbooks/roles/update_agent/tasks/main.yml b/jcloud/playbooks/roles/update_agent/tasks/main.yml index 8170287..81997c2 100644 --- a/jcloud/playbooks/roles/update_agent/tasks/main.yml +++ b/jcloud/playbooks/roles/update_agent/tasks/main.yml @@ -28,7 +28,7 @@ - name: Update Agent become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent update + command: /home/jingrow/agent/env/bin/python -m agent.cli update args: chdir: /home/jingrow/agent ignore_errors: yes @@ -36,14 +36,14 @@ - name: Update Agent database become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent setup database + command: /home/jingrow/agent/env/bin/python -m agent.cli setup database args: chdir: /home/jingrow/agent - name: Run agent db patches become: yes become_user: jingrow - command: /home/jingrow/agent/env/bin/agent run-patches + command: /home/jingrow/agent/env/bin/python -m agent.cli run-patches args: chdir: /home/jingrow/agent