From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- lib/ansible/playbooks/prepare_overcloud_containers.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/ansible/playbooks/prepare_overcloud_containers.yml') diff --git a/lib/ansible/playbooks/prepare_overcloud_containers.yml b/lib/ansible/playbooks/prepare_overcloud_containers.yml index 88a8df1c..79629c2b 100644 --- a/lib/ansible/playbooks/prepare_overcloud_containers.yml +++ b/lib/ansible/playbooks/prepare_overcloud_containers.yml @@ -21,7 +21,7 @@ - name: Prepare generic docker registry image file shell: > {{ stackrc }} && openstack overcloud container image prepare - --namespace trunk.registry.rdoproject.org/{{ os_version }} + --namespace docker.io/tripleo{{ os_version }} --tag {{ container_tag }} --push-destination {{ undercloud_ip }}:8787 -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml @@ -31,7 +31,7 @@ - name: Prepare SDN docker registry image file shell: > {{ stackrc }} && openstack overcloud container image prepare - --namespace trunk.registry.rdoproject.org/{{ os_version }} + --namespace docker.io/tripleo{{ os_version }} --tag {{ container_tag }} --push-destination {{ undercloud_ip }}:8787 -e {{ sdn_env_file }} @@ -56,13 +56,13 @@ - name: Patch Docker images shell: > cd /home/stack/containers/{{ item }} && docker build - -t {{ undercloud_ip }}:8787/{{ os_version }}/centos-binary-{{ item }}:apex . + -t {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex . when: - patched_docker_services|length > 0 - item in (response.json)['repositories']|join(" ") with_items: "{{ patched_docker_services }}" - name: Push patched docker images to local registry - shell: docker push {{ undercloud_ip }}:8787/{{ os_version }}/centos-binary-{{ item }}:apex + shell: docker push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex when: - patched_docker_services|length > 0 - item in (response.json)['repositories']|join(" ") @@ -70,7 +70,7 @@ - name: Prepare deployment generic docker image file shell: > {{ stackrc }} && openstack overcloud container image prepare - --namespace {{ undercloud_ip }}:8787/{{ os_version }} + --namespace {{ undercloud_ip }}:8787/tripleo{{ os_version }} --tag {{ container_tag }} -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml --output-env-file docker-images.yaml @@ -79,7 +79,7 @@ - name: Prepare deployment SDN docker image file shell: > {{ stackrc }} && openstack overcloud container image prepare - --namespace {{ undercloud_ip }}:8787/{{ os_version }} + --namespace {{ undercloud_ip }}:8787/tripleo{{ os_version }} --tag {{ container_tag }} -e {{ sdn_env_file }} --output-env-file sdn-images.yaml -- cgit 1.2.3-korg