diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index bd389f97a..6bc9ce0ce 100644 --- a/playbooks/kayobe-overcloud-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2 @@ -4,9 +4,6 @@ docker_daemon_debug: true docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}" diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index 1170a5ed9..dc8fdb04f 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 @@ -4,9 +4,6 @@ docker_daemon_debug: true docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" {% if not is_previous_release | default(false) %} kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index 91c09a698..eb30249d0 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-base/overrides.yml.j2 @@ -4,9 +4,6 @@ docker_daemon_debug: true docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" # NOTE(mgoddard): The kolla repository is copied to /tmp/kolla and made # readable by the stack user. kolla_source_url: "/tmp/kolla" diff --git a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 index 683833025..81c773b0d 100644 --- a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 @@ -4,9 +4,6 @@ docker_daemon_debug: true docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" {% if not is_previous_release | default(false) %} kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"