diff options
| author |   Ricardo Noriega <rnoriega@redhat.com> | 2018-07-27 11:29:41 +0200 |
|---|---|---|
| committer | Ricardo Noriega <rnoriega@redhat.com> | 2018-08-02 16:10:53 +0200 |
| commit | c4b66d46770847e9090a06c4c2ec3e8266606282 (patch) | |
| tree | 704dc9f02450146a4cbb1646c2e8c4168f38dfcb /apex/deploy.py | |
| parent | 31c91eafaf4ede17b057b9ae16df3821fe8c0aca (diff) | |
Enable BGPVPN for master deployments
- Injection of Quagga tarball via overcloud builder.
- Extraction and installation of all related packages.
- It uses SDNVPN artifact repository to download Quagga
tarball, so there is only one source to test.
- Modifies bgpvpn scenario files to use OS master branch,
ODL master branch and containers.
JIRA: APEX-627
Change-Id: Icdbc2853d9531048e23fd6d5e444bd68208d18fc
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'apex/deploy.py')
| -rw-r--r-- | apex/deploy.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index 65f00e04..70bc3a5a 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -433,6 +433,10 @@ def main(): 'prepare_overcloud_containers.yml') if ds_opts['containers']: logging.info("Preparing Undercloud with Docker containers") + sdn_env = oc_deploy.get_docker_sdn_files(ds_opts) + sdn_env_files = str() + for sdn_file in sdn_env: + sdn_env_files += " -e {}".format(sdn_file) if patched_containers: oc_builder.archive_docker_patches(APEX_TEMP_DIR) container_vars = dict() @@ -445,8 +449,7 @@ def main(): container_vars['undercloud_ip'] = undercloud_admin_ip container_vars['os_version'] = os_version container_vars['aarch64'] = platform.machine() == 'aarch64' - container_vars['sdn_env_file'] = \ - oc_deploy.get_docker_sdn_file(ds_opts) + container_vars['sdn_env_file'] = sdn_env_files try: utils.run_ansible(container_vars, docker_playbook, host=undercloud.ip, user='stack', |