Skip to content

Commit 7692128

Browse files
committed
Use username and password for Pulp authentication
1 parent df3c774 commit 7692128

File tree

1 file changed

+44
-22
lines changed

1 file changed

+44
-22
lines changed

etc/kayobe/pulp.yml

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -325,98 +325,120 @@ stackhpc_pulp_repository_rpm_repos:
325325
# Additional repositories required to build Kolla containers from local Pulp service.
326326
- name: CentOS Stream 8 - OpenStack Wallaby
327327
url: "{{ stackhpc_release_pulp_content_url }}/centos/8-stream/cloud/x86_64/openstack-wallaby/{{ stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version }}"
328-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
329-
client_key: "{{ stackhpc_release_pulp_client_key }}"
328+
remote_username: "{{ stackhpc_release_pulp_username }}"
329+
remote_password: "{{ stackhpc_release_pulp_password }}"
330+
client_cert: ""
331+
client_key: ""
330332
policy: on_demand
331333
sync_policy: mirror_complete
332334
state: present
333335
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
334336

335337
- name: CentOS Stream 8 - Advanced Virtualization
336338
url: "{{ stackhpc_release_pulp_content_url }}/centos/8-stream/virt/x86_64/advancedvirt-common/{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}"
337-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
338-
client_key: "{{ stackhpc_release_pulp_client_key }}"
339+
remote_username: "{{ stackhpc_release_pulp_username }}"
340+
remote_password: "{{ stackhpc_release_pulp_password }}"
341+
client_cert: ""
342+
client_key: ""
339343
policy: on_demand
340344
sync_policy: mirror_complete
341345
state: present
342346
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
343347

344348
- name: CentOS Stream 8 - NFV OpenvSwitch
345349
url: "{{ stackhpc_release_pulp_content_url }}/centos/8-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}"
346-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
347-
client_key: "{{ stackhpc_release_pulp_client_key }}"
350+
remote_username: "{{ stackhpc_release_pulp_username }}"
351+
remote_password: "{{ stackhpc_release_pulp_password }}"
352+
client_cert: ""
353+
client_key: ""
348354
policy: on_demand
349355
sync_policy: mirror_complete
350356
state: present
351357
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
352358

353359
- name: CentOS Stream 8 - PowerTools
354360
url: "{{ stackhpc_release_pulp_content_url }}/centos/8-stream/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
355-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
356-
client_key: "{{ stackhpc_release_pulp_client_key }}"
361+
remote_username: "{{ stackhpc_release_pulp_username }}"
362+
remote_password: "{{ stackhpc_release_pulp_password }}"
363+
client_cert: ""
364+
client_key: ""
357365
policy: on_demand
358366
sync_policy: mirror_complete
359367
state: present
360368
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
361369

362370
- name: CentOS 8 - OpsTools - collectd
363371
url: "{{ stackhpc_release_pulp_content_url }}/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
364-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
365-
client_key: "{{ stackhpc_release_pulp_client_key }}"
372+
remote_username: "{{ stackhpc_release_pulp_username }}"
373+
remote_password: "{{ stackhpc_release_pulp_password }}"
374+
client_cert: ""
375+
client_key: ""
366376
policy: on_demand
367377
sync_policy: mirror_complete
368378
state: present
369379
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
370380

371381
- name: CentOS Stream 8 - Ceph Pacific
372382
url: "{{ stackhpc_release_pulp_content_url }}/centos/8-stream/storage/x86_64/ceph-pacific/{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
373-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
374-
client_key: "{{ stackhpc_release_pulp_client_key }}"
383+
remote_username: "{{ stackhpc_release_pulp_username }}"
384+
remote_password: "{{ stackhpc_release_pulp_password }}"
385+
client_cert: ""
386+
client_key: ""
375387
policy: on_demand
376388
sync_policy: mirror_complete
377389
state: present
378390
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
379391

380392
- name: ELK repository for 7.x packages
381393
url: "{{ stackhpc_release_pulp_content_url }}/elasticsearch/oss-7.x/{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
382-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
383-
client_key: "{{ stackhpc_release_pulp_client_key }}"
394+
remote_username: "{{ stackhpc_release_pulp_username }}"
395+
remote_password: "{{ stackhpc_release_pulp_password }}"
396+
client_cert: ""
397+
client_key: ""
384398
policy: on_demand
385399
sync_policy: mirror_complete
386400
state: present
387401
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
388402

389403
- name: Grafana
390404
url: "{{ stackhpc_release_pulp_content_url }}/grafana/oss/rpm/{{ stackhpc_pulp_repo_grafana_version }}"
391-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
392-
client_key: "{{ stackhpc_release_pulp_client_key }}"
405+
remote_username: "{{ stackhpc_release_pulp_username }}"
406+
remote_password: "{{ stackhpc_release_pulp_password }}"
407+
client_cert: ""
408+
client_key: ""
393409
policy: on_demand
394410
sync_policy: mirror_complete
395411
state: present
396412
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
397413

398414
- name: RabbitMQ - Erlang
399415
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
400-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
401-
client_key: "{{ stackhpc_release_pulp_client_key }}"
416+
remote_username: "{{ stackhpc_release_pulp_username }}"
417+
remote_password: "{{ stackhpc_release_pulp_password }}"
418+
client_cert: ""
419+
client_key: ""
402420
policy: on_demand
403421
sync_policy: mirror_complete
404422
state: present
405423
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
406424

407425
- name: RabbitMQ - Server
408426
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
409-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
410-
client_key: "{{ stackhpc_release_pulp_client_key }}"
427+
remote_username: "{{ stackhpc_release_pulp_username }}"
428+
remote_password: "{{ stackhpc_release_pulp_password }}"
429+
client_cert: ""
430+
client_key: ""
411431
policy: on_demand
412432
sync_policy: mirror_complete
413433
state: present
414434
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
415435

416436
- name: TreasureData 4
417437
url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/8/x86_64/{{ stackhpc_pulp_repo_treasuredata_4_version }}"
418-
client_cert: "{{ stackhpc_release_pulp_client_cert }}"
419-
client_key: "{{ stackhpc_release_pulp_client_key }}"
438+
remote_username: "{{ stackhpc_release_pulp_username }}"
439+
remote_password: "{{ stackhpc_release_pulp_password }}"
440+
client_cert: ""
441+
client_key: ""
420442
policy: on_demand
421443
sync_policy: mirror_complete
422444
state: present

0 commit comments

Comments
 (0)