Merge "Default to docker.io instead of trunk.registry.rdoproject.org"

This commit is contained in:
Zuul 2018-02-11 17:02:25 +00:00 committed by Gerrit Code Review
commit 7af8eb077a
2 changed files with 4 additions and 4 deletions

View File

@ -41,8 +41,8 @@ build_undercloud: false
tempest_track_resources: false
# Container settings
docker_registry_host: trunk.registry.rdoproject.org
docker_registry_namespace: "{{ release }}"
docker_registry_host: docker.io
docker_registry_namespace: "tripleo{{ release }}"
# Container update settings
update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"

View File

@ -19,8 +19,8 @@ workers_args: >-
-e {{ overcloud_templates_path }}/environments/debug.yaml
overcloud_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
ipa_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
docker_registry_host: trunk.registry.rdoproject.org
docker_registry_namespace: "{{ release }}"
docker_registry_host: docker.io
docker_registry_namespace: "tripleo{{ release }}"
# Container update settings
update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"