diff options
| author | Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> | 2022-10-12 21:56:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 21:56:32 +0200 |
| commit | b9c9800210bb0293a9dbb911397d17c1b2e0439b (patch) | |
| tree | 684340a8c99165f242ca8e59724e864c7f4ddd17 | |
| parent | Merge pull request #13035 from AlanCoding/mike_patch (diff) | |
| parent | add podman config role in instance install bundle (diff) | |
| download | awx-b9c9800210bb0293a9dbb911397d17c1b2e0439b.tar.xz awx-b9c9800210bb0293a9dbb911397d17c1b2e0439b.zip | |
Merge pull request #13043 from TheRealHaoLiu/instance_install_bundle-configure-podman
add podman config role in instance install bundle
3 files changed, 10 insertions, 6 deletions
diff --git a/awx/api/templates/instance_install_bundle/group_vars/all.yml b/awx/api/templates/instance_install_bundle/group_vars/all.yml index 7d6332ab84..d0eb00f6b9 100644 --- a/awx/api/templates/instance_install_bundle/group_vars/all.yml +++ b/awx/api/templates/instance_install_bundle/group_vars/all.yml @@ -1,3 +1,5 @@ +receptor_user: awx +receptor_group: awx receptor_verify: true receptor_tls: true receptor_work_commands: @@ -10,12 +12,12 @@ custom_worksign_public_keyfile: receptor/work-public-key.pem custom_tls_certfile: receptor/tls/receptor.crt custom_tls_keyfile: receptor/tls/receptor.key custom_ca_certfile: receptor/tls/ca/receptor-ca.crt -receptor_user: awx -receptor_group: awx receptor_protocol: 'tcp' receptor_listener: true receptor_port: {{ instance.listener_port }} receptor_dependencies: - - podman - - crun - python39-pip +{% verbatim %} +podman_user: "{{ receptor_user }}" +podman_group: "{{ receptor_group }}" +{% endverbatim %} diff --git a/awx/api/templates/instance_install_bundle/install_receptor.yml b/awx/api/templates/instance_install_bundle/install_receptor.yml index 0f0789df67..b6fc9f5d2d 100644 --- a/awx/api/templates/instance_install_bundle/install_receptor.yml +++ b/awx/api/templates/instance_install_bundle/install_receptor.yml @@ -10,9 +10,11 @@ - name: Enable Copr repo for Receptor command: dnf copr enable ansible-awx/receptor -y - import_role: + name: ansible.receptor.podman + - import_role: name: ansible.receptor.setup - name: Install ansible-runner pip: name: ansible-runner executable: pip3.9 -{% endverbatim %}
\ No newline at end of file +{% endverbatim %} diff --git a/awx/api/templates/instance_install_bundle/requirements.yml b/awx/api/templates/instance_install_bundle/requirements.yml index 515f3da2a4..3fed8496e0 100644 --- a/awx/api/templates/instance_install_bundle/requirements.yml +++ b/awx/api/templates/instance_install_bundle/requirements.yml @@ -1,4 +1,4 @@ --- collections: - name: ansible.receptor - version: 1.0.0 + version: 1.1.0 |