diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-12 17:32:56 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-11-06 04:35:02 +0000 |
| commit | b3c610b205f88dddb02cdac39638c52eafaaf82c (patch) | |
| tree | 4826027e2d968e61c8024d972f3665ff3a8a09d7 /lib | |
| parent | 3c7556eb0734706f28588fb952eedea2d424c6d2 (diff) | |
Adds ability to deploy from upstream openstack
To deploy with upstream openstack branch, use new deploy setting 'os_version'.
A default scenario file for nosdn with pike has been included in this patch.
If 'os_version' is a version other than the default version for this OPNFV
release, then upstream is used.
In order to use upstream with the current OS version use '--upstream'
argument to the deploy command, to force an upstream deployment.
Also include '-e upstream-environment.yaml' to use default upstream
deployment settings.
Supports nosdn and odl-nofeature deployments.
Change-Id: Ic07e308827b449637b4e86cdd086434e4de2fb69
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/playbooks/deploy_overcloud.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml index 19e46380..8acfa764 100644 --- a/lib/ansible/playbooks/deploy_overcloud.yml +++ b/lib/ansible/playbooks/deploy_overcloud.yml @@ -11,11 +11,19 @@ with_items: - network-environment.yaml - instackenv.json - - opnfv-environment.yaml - overcloud-full.qcow2 - deploy_command - virtual-environment.yaml - baremetal-environment.yaml + - "{{ apex_env_file }}" + - name: Copy network data to undercloud + copy: + src: "{{ apex_temp_dir }}/network_data.yaml" + dest: "/home/stack/network_data.yaml" + owner: stack + group: stack + mode: 0644 + when: os_version != 'ocata' - copy: src: "{{ apex_temp_dir }}/storage-environment.yaml" dest: /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml |