Skip to content

Commit 97f5e34

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

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
- name: Login to docker registry
3+
docker_login:
4+
registry_url: "{{ kolla_docker_registry or omit }}"
5+
username: "{{ kolla_docker_registry_username }}"
6+
password: "{{ kolla_docker_registry_password }}"
7+
reauthorize: yes
8+
when:
9+
- seed_pulp_container_enabled | bool

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
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../ansible/pulp-docker-registry-login.yml
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
###############################################################################
3+
# Seed node docker regsitry configuration.
4+
5+
# Whether to attempt a basic authentication login to a registry when
6+
# deploying seed containers
7+
deploy_containers_registry_attempt_login: False

0 commit comments

Comments
 (0)