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/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/deploy.py')
| -rw-r--r-- | apex/deploy.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index bc4d0789..1e384a6e 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -488,6 +488,8 @@ def main(): deploy_vars['stackrc'] = 'source /home/stack/stackrc' deploy_vars['overcloudrc'] = 'source /home/stack/overcloudrc' deploy_vars['upstream'] = upstream + deploy_vars['undercloud_ip'] = undercloud_admin_ip + deploy_vars['ha_enabled'] = ha_enabled deploy_vars['os_version'] = os_version deploy_vars['http_proxy'] = net_settings.get('http_proxy', '') deploy_vars['https_proxy'] = net_settings.get('https_proxy', '') @@ -558,6 +560,7 @@ def main(): deploy_vars['vpn'] = ds_opts['vpn'] deploy_vars['l2gw'] = ds_opts.get('l2gw') deploy_vars['sriov'] = ds_opts.get('sriov') + deploy_vars['tacker'] = ds_opts.get('tacker') # TODO(trozet): pull all logs and store in tmp dir in overcloud # playbook post_overcloud = os.path.join(args.lib_dir, constants.ANSIBLE_PATH, |