Skip to content

Commit ac809cb

Browse files
committed
Skip docker registry login by default, login only when pulp is deployed
1 parent e1a64bd commit ac809cb

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

etc/kayobe/containers/pulp/post.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@
2727
when:
2828
- stackhpc_pulp_sync_for_local_container_build | bool
2929
- pulp_settings.changed
30+
31+
- name: Login to docker registry
32+
docker_login:
33+
registry_url: "{{ kolla_docker_registry or omit }}"
34+
username: "{{ kolla_docker_registry_username }}"
35+
password: "{{ kolla_docker_registry_password }}"
36+
reauthorize: yes

etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ kayobe seed vm provision
8787
kayobe seed host configure
8888

8989
# Deploy local pulp server as a container on the seed VM
90-
kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none -e deploy_containers_registry_attempt_login=False
90+
kayobe seed service deploy --tags seed-deploy-containers --kolla-tags
9191

9292
# Deploying the seed restarts networking interface, run configure-local-networking.sh again to re-add routes.
9393
$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networking.sh

etc/kayobe/seed.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ seed_containers: >-
152152
153153
seed_extra_containers: {}
154154

155+
# Whether to attempt a basic authentication login to a registry when
156+
# deploying seed containers
157+
seed_deploy_containers_registry_attempt_login: "{{ not seed_pulp_container_enabled | bool }}"
158+
155159
###############################################################################
156160
# Seed node firewalld configuration.
157161

0 commit comments

Comments
 (0)