Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions etc/kayobe/ansible/roles/pulp_auth_proxy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
- name: Check if Docker bridge network exists
community.docker.docker_host_info:
networks: true
register: docker_host_info
register: pulp_auth_proxy_docker_host_info

- name: Set a fact about the network mode
ansible.builtin.set_fact:
pulp_auth_proxy_network_mode: "{{ 'host' if docker_host_info.networks | selectattr('Driver', 'equalto', 'bridge') | list | length == 0 else 'bridge' }}"
pulp_auth_proxy_network_mode: "{{ 'host' if pulp_auth_proxy_docker_host_info.networks | selectattr('Driver', 'equalto', 'bridge') | list | length == 0 else 'bridge' }}"

- name: Assert that localhost is resolvable when using host networking
ansible.builtin.assert:
Expand All @@ -33,7 +33,7 @@
dest: "{{ pulp_auth_proxy_conf_path }}/pulp_proxy.conf"
mode: "0600"
become: true
register: pulp_proxy_conf
register: pulp_auth_proxy_conf

- name: Ensure pulp_proxy container is running
community.docker.docker_container:
Expand All @@ -43,14 +43,14 @@
ports:
- "{{ pulp_auth_proxy_listen_ip }}:{{ pulp_auth_proxy_listen_port }}:80"
restart_policy: "no"
restart: "{{ pulp_proxy_conf is changed }}"
restart: "{{ pulp_auth_proxy_conf is changed }}"
volumes:
- "{{ pulp_auth_proxy_conf_path }}/pulp_proxy.conf:/etc/nginx/conf.d/default.conf:ro"

- name: Wait for pulp_proxy container to become accessible
ansible.builtin.uri:
url: http://localhost/pulp/api/v3/status/
register: uri_result
until: uri_result is success
register: pulp_auth_proxy_uri_result
until: pulp_auth_proxy_uri_result is success
retries: 30
delay: 2
4 changes: 2 additions & 2 deletions etc/kayobe/stackhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"

# Kolla source repository.
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
stackhpc_kolla_source_version: stackhpc/18.7.0.8
stackhpc_kolla_source_version: stackhpc/18.7.0.9

# Kolla Ansible source repository.
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.7
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.10

###############################################################################
# Container image registry
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/16.7.0.4
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/16.7.0.5
ansible-modules-hashivault>=5.2.1
jmespath
Loading