Skip to content

Commit 12247a6

Browse files
committed
Move docker_regsitry_insecure to docker.yml
1 parent 11c129f commit 12247a6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

etc/kayobe/docker.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
# URL of docker registry
2525
docker_registry: "{{ stackhpc_docker_registry }}"
2626

27+
# Whether docker should be configured to use an insecure registry.
28+
# Default is false, unless docker_registry_enabled is true and
29+
# docker_registry_enable_tls is false.
30+
docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
31+
2732
# CA of docker registry
2833
#docker_registry_ca:
2934

etc/kayobe/kolla.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
8181
# Docker namespace to use for Kolla images. Default is 'kolla'.
8282
kolla_docker_namespace: stackhpc
8383

84-
# Whether docker should be configured to use an insecure registry for Kolla
85-
# images. Default is false, unless docker_registry_enabled is true and
86-
# docker_registry_enable_tls is false.
87-
kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
88-
8984
# Username to use to access a docker registry. Default is not set, in which
9085
# case the registry will be used without authentication.
9186
kolla_docker_registry_username: "{{ stackhpc_docker_registry_username }}"

0 commit comments

Comments
 (0)