Skip to content

Commit fc6798e

Browse files
authored
Update stackhpc-ci.yml
1 parent 570409b commit fc6798e

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

etc/kayobe/environments/ci-capi-aio/stackhpc-ci.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Kolla configuration.
44

55
# Docker namespace to use for Kolla images. Default is 'kolla'.
6-
#kolla_docker_namespace: stackhpc-dev
6+
kolla_docker_namespace: stackhpc-dev
77

88
# Do not enable central logging if using Rocky Linux 9. It does not have elasticsearch
99
kolla_enable_central_logging: "{{ os_release != '9' }}"
@@ -26,7 +26,7 @@ resolv_is_managed: false
2626

2727
# Host and port of a package repository mirror.
2828
# Build and deploy the development Pulp service repositories.
29-
stackhpc_repo_mirror_url: "https://pulp.128-232-222-245.sslip.io"
29+
stackhpc_repo_mirror_url: "http://pulp-server.internal.sms-cloud:8080"
3030

3131
# Build and deploy released Pulp repository versions.
3232
stackhpc_repo_centos_stream_baseos_version: "{{ stackhpc_pulp_repo_centos_stream_8_baseos_version }}"
@@ -53,7 +53,7 @@ stackhpc_repo_ubuntu_focal_version: "{{ stackhpc_pulp_repo_ubuntu_focal_version
5353
stackhpc_repo_ubuntu_focal_security_version: "{{ stackhpc_pulp_repo_ubuntu_focal_security_version }}"
5454
stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
5555
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
56-
stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version }}"
56+
stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream__openstack_yoga_version }}"
5757
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
5858
stackhpc_repo_centos_stream_9_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version }}"
5959
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
@@ -73,16 +73,18 @@ stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstrea
7373
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
7474

7575
# Rocky-and-CI-specific Pulp urls
76-
stackhpc_repo_rocky_baseos_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/BaseOS/x86_64/os/{{ stackhpc_repo_rocky_baseos_version }}/"
77-
stackhpc_repo_rocky_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/AppStream/x86_64/os/{{ stackhpc_repo_rocky_appstream_version }}/"
78-
stackhpc_repo_rocky_extras_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/extras/x86_64/os/{{ stackhpc_repo_rocky_extras_version }}/"
79-
stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}"
80-
stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstream_version }}"
81-
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
82-
83-
# Pull through cache mirring ark.stackhpc.com
84-
stackhpc_docker_registry: "registry.128-232-222-245.sslip.io"
76+
stackhpc_include_os_minor_version_in_repo_url: true
8577

86-
# We don't use auth against the pulp server
87-
secrets_pulp_password: ""
78+
# Host and port of container registry.
79+
# Push built images to the development Pulp service registry.
80+
stackhpc_docker_registry: "{{ stackhpc_repo_mirror_url | regex_replace('^https?://', '') }}"
8881

82+
# Username and password of container registry.
83+
stackhpc_docker_registry_username: "admin"
84+
stackhpc_docker_registry_password: !vault |
85+
$ANSIBLE_VAULT;1.1;AES256
86+
38653432663133653430323937626239323836653537633633326265643930653034306532646464
87+
3766353637326534643136326533633034666535323364660a633639393433376564363666663233
88+
38333133393730633666613965653364316162353337313330346164303631313731646461363461
89+
3963323635373866630a633533376339363734626664333765313665623662613764363038383735
90+
38646138376438643533376161376634653439386230353365316239613430363338

0 commit comments

Comments
 (0)