diff options
author | Tim Rozet <trozet@redhat.com> | 2018-05-02 12:34:38 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2018-05-21 10:36:05 -0400 |
commit | d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d (patch) | |
tree | 5cf7a0d04cbf8b30488bb18ba7ee79e215f08e47 /apex/builders/overcloud_builder.py | |
parent | 22bc385f5b2e25694699a614268aaad2fdacbb12 (diff) |
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 <trozet@redhat.com>
Diffstat (limited to 'apex/builders/overcloud_builder.py')
-rw-r--r-- | apex/builders/overcloud_builder.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builders/overcloud_builder.py b/apex/builders/overcloud_builder.py index a84d100b..d2a31001 100644 --- a/apex/builders/overcloud_builder.py +++ b/apex/builders/overcloud_builder.py @@ -53,7 +53,7 @@ def inject_opendaylight(odl_version, image, tmp_dir, uc_ip, "enabled=1' > /etc/yum.repos.d/opendaylight.repo", "RUN yum -y install opendaylight" ] - src_img_uri = "{}:8787/{}/centos-binary-{}:" \ + src_img_uri = "{}:8787/tripleo{}/centos-binary-{}:" \ "{}".format(uc_ip, os_version, 'opendaylight', docker_tag) build_dockerfile('opendaylight', tmp_dir, docker_cmds, src_img_uri) |