diff options
| author |   Brady Johnson <bjohnson@inocybe.com> | 2017-11-30 17:13:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-30 17:13:07 +0000 |
| commit | 9d416596f133ac7fa73e6cbbbf3adbe0fe86cc1b (patch) | |
| tree | d7f5e85032a75531219e82948932e33607df66b8 /scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml | |
| parent | f1304eec7ac5997868ba7eae53a1da7e0c90679b (diff) | |
| parent | a72cc42077b96223ad6e776a4cd0f03a3c41bd29 (diff) | |
Merge "[WIP] Adapt XCI scenarios for Fraser"
Diffstat (limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml')
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml index f1fdcf2a..819ef203 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml @@ -8,8 +8,18 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -- name: Add SFC repos and inventory - include: add-sfc-repos-and-inventory.yml +- name: Add SFC repos and inventory for Pike + include: add-sfc-repos-and-inventory-pike.yml + when: OPENSTACK_OSA_VERSION == "stable/pike" -- name: Copy the OSA not-yet-upstreamed files - include: copy-OSA-files.yml +- name: Add SFC repos and inventory for master + include: add-sfc-repos-and-inventory-master.yml + when: OPENSTACK_OSA_VERSION != "stable/pike" + +- name: Copy the OSA not-yet-upstreamed files for Pike + include: copy-OSA-files-pike.yml + when: OPENSTACK_OSA_VERSION == "stable/pike" + +- name: Copy the OSA not-yet-upstreamed files for master + include: copy-OSA-files-master.yml + when: OPENSTACK_OSA_VERSION != "stable/pike" |