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/overcloud/deploy.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/overcloud/deploy.py')
-rw-r--r-- | apex/overcloud/deploy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 03e56529..6b7c2db0 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -144,15 +144,16 @@ def get_docker_sdn_file(ds_opts): """ # FIXME(trozet): We assume right now there is only one docker SDN file docker_services = con.VALID_DOCKER_SERVICES + tht_dir = con.THT_DOCKER_ENV_DIR[ds_opts['os_version']] sdn_env_list = build_sdn_env_list(ds_opts, SDN_FILE_MAP) for sdn_file in sdn_env_list: sdn_base = os.path.basename(sdn_file) if sdn_base in docker_services: if docker_services[sdn_base] is not None: - return os.path.join(con.THT_DOCKER_ENV_DIR, + return os.path.join(tht_dir, docker_services[sdn_base]) else: - return os.path.join(con.THT_DOCKER_ENV_DIR, sdn_base) + return os.path.join(tht_dir, sdn_base) def create_deploy_cmd(ds, ns, inv, tmp_dir, @@ -430,7 +431,6 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None, {con.VIRT_UPLOAD: "{}:/usr/lib/systemd/system/".format(tmp_losetup) }, {con.VIRT_RUN_CMD: 'truncate /srv/data.img --size 10G'}, - {con.VIRT_RUN_CMD: 'mkfs.ext4 -F /srv/data.img'}, {con.VIRT_RUN_CMD: 'systemctl daemon-reload'}, {con.VIRT_RUN_CMD: 'systemctl enable losetup.service'}, ]) |