openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Pass CA pass to Swift CLI

Browse Source 
Swift requires CA path to be set either with OS_CACERT env var or with
simmilar flag passed to command.

Change-Id: I40e4a0ae0e702fdc9bfbb18dcc6ef1ea3f84926f
This commit is contained in:
Dmitriy Rabotyagov 2022-11-25 10:56:59 +01:00
parent ab6999da9d
commit b09526d494
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/ironic_post_install.yml
View File

@ -15,7 +15,7 @@
- name: Post swift tempURL secret key - name: Post swift tempURL secret key
command: > command: >
{{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} {{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure', '--os-cacert ' ~ _ironic_ssl_truststore_location) }}
--os-username "service:{{ glance_service_user_name }}" --os-username "service:{{ glance_service_user_name }}"
--os-password "{{ glance_service_password }}" --os-password "{{ glance_service_password }}"
--os-auth-url {{ keystone_service_internalurl }} --os-auth-url {{ keystone_service_internalurl }}
@ -32,7 +32,7 @@
- name: Get swift account - name: Get swift account
shell: > shell: >
{{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} {{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure', '--os-cacert ' ~ _ironic_ssl_truststore_location) }}
--os-username "service:{{ glance_service_user_name }}" --os-username "service:{{ glance_service_user_name }}"
--os-password "{{ glance_service_password }}" --os-password "{{ glance_service_password }}"
--os-auth-url {{ keystone_service_internalurl }} --os-auth-url {{ keystone_service_internalurl }}

2
vars/debian.yml
View File

@ -98,3 +98,5 @@ ironic_inspector_library_modules_paths:
ironic_nginx_conf_path: "sites-available" ironic_nginx_conf_path: "sites-available"
ironic_grub_dir: "/tftpboot/grub" ironic_grub_dir: "/tftpboot/grub"
_ironic_ssl_truststore_location: /etc/ssl/certs/ca-certificates.crt

2
vars/redhat.yml
View File

@ -85,3 +85,5 @@ ironic_inspector_library_modules_paths:
ironic_nginx_conf_path: "conf.d" ironic_nginx_conf_path: "conf.d"
ironic_grub_dir: "/tftpboot/EFI/{{ ansible_facts['distribution'] | lower }}" ironic_grub_dir: "/tftpboot/EFI/{{ ansible_facts['distribution'] | lower }}"
_ironic_ssl_truststore_location: /etc/pki/tls/certs/ca-bundle.crt