Skip to content

Commit ebd068f

Browse files
authored
Merge pull request #2294 from stackhpc/aio-image-cache
Use pull-through cache on SMS for AIOs
2 parents 63f3653 + c2cea18 commit ebd068f

1 file changed

Lines changed: 16 additions & 20 deletions

File tree

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@ kolla_docker_namespace: stackhpc-dev
88
###############################################################################
99
# StackHPC configuration.
1010

11+
# AIOs currently run on SMS, and pull packages and containers through an
12+
# authenticating caching proxy.
1113
# Host and port of a package repository mirror.
12-
# Build and deploy the development Pulp service repositories.
13-
# Use Ark's package repositories to install packages.
14-
stackhpc_repo_mirror_url: "{{ stackhpc_release_pulp_url }}"
15-
stackhpc_repo_mirror_username: "skc-ci-aio-epoxy"
16-
stackhpc_repo_mirror_password: !vault |
17-
$ANSIBLE_VAULT;1.1;AES256
18-
66666132666635313565646233353065623465316332323337356366303262363437353162643430
19-
3138303131313865646532633063666539306332663933340a386131316664663238633534623862
20-
65303835626463356666623563333464623630633936663162353935633132376634666463633139
21-
3363383033613330360a356639333463643461353462346466633365626333393331633833326634
22-
64366233653036333032323334353332643735623264376137383564383361303462
14+
stackhpc_aio_proxy_address: "192.168.46.157"
15+
stackhpc_repo_mirror_url: "http://{{ stackhpc_aio_proxy_address }}:80"
16+
# Host and port of container registry.
17+
stackhpc_docker_registry: "{{ stackhpc_aio_proxy_address }}:5000"
18+
docker_registry_insecure: true
2319

2420
# Build against released Pulp repository versions.
2521
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
@@ -57,17 +53,17 @@ stackhpc_repo_rhel9_doca_modules_version: "{{ stackhpc_pulp_repo_rhel9_doca_modu
5753
# Rocky-and-CI-specific Pulp urls
5854
stackhpc_include_os_minor_version_in_repo_url: true
5955

60-
# Host and port of container registry.
61-
# Push built images to the development Pulp service registry.
62-
stackhpc_docker_registry: "{{ stackhpc_repo_mirror_url | regex_replace('^https?://', '') }}"
63-
stackhpc_docker_registry_username: "{{ stackhpc_repo_mirror_username }}"
64-
stackhpc_docker_registry_password: "{{ stackhpc_repo_mirror_password }}"
65-
6656
# Override Pulp credentials to allow querying container image tags in the
6757
# check-tags.yml custom playbook.
68-
pulp_url: "{{ stackhpc_repo_mirror_url }}"
69-
pulp_username: "{{ stackhpc_repo_mirror_username }}"
70-
pulp_password: "{{ stackhpc_repo_mirror_password }}"
58+
pulp_url: "{{ stackhpc_release_pulp_url }}"
59+
pulp_username: "skc-ci-aio-epoxy"
60+
pulp_password: !vault |
61+
$ANSIBLE_VAULT;1.1;AES256
62+
66666132666635313565646233353065623465316332323337356366303262363437353162643430
63+
3138303131313865646532633063666539306332663933340a386131316664663238633534623862
64+
65303835626463356666623563333464623630633936663162353935633132376634666463633139
65+
3363383033613330360a356639333463643461353462346466633365626333393331633833326634
66+
64366233653036333032323334353332643735623264376137383564383361303462
7167
7268
# Ensure Blackbox monitoring configuration is generated correctly
7369
seed_pulp_container_enabled: false

0 commit comments

Comments
 (0)