diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-29 23:17:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 23:17:53 +0000 |
| commit | c104a284855069882e2625c57b5c2c78b0c6ba4d (patch) | |
| tree | a11156ea94ff9dfddcc278c973771d66c452c332 /config | |
| parent | 5729ad141664925d922ea6cbea7cdcde09d9b18c (diff) | |
| parent | b6896a9bbfd7d4825f6b68b594441a3e0be7b85f (diff) | |
Merge "re-enable support for fdio dvr scenario" into stable/euphrates
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy/os-odl-fdio-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl-fdio-noha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl-fdio_dvr-ha.yaml (renamed from config/deploy/os-odl-fdio-dvr-ha.yaml) | 4 | ||||
| -rw-r--r-- | config/deploy/os-odl-fdio_dvr-noha.yaml (renamed from config/deploy/os-odl-fdio-dvr-noha.yaml) | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml index c02b22be..2125265e 100644 --- a/config/deploy/os-odl-fdio-ha.yaml +++ b/config/deploy/os-odl-fdio-ha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: sdn_controller: opendaylight - odl_version: carbon + odl_version: oxygen odl_vpp_routing_node: overcloud-novacompute-0 tacker: true congress: true diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml index 4aab0520..17eea880 100644 --- a/config/deploy/os-odl-fdio-noha.yaml +++ b/config/deploy/os-odl-fdio-noha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: sdn_controller: opendaylight - odl_version: carbon + odl_version: oxygen odl_vpp_routing_node: overcloud-novacompute-0 tacker: true congress: true diff --git a/config/deploy/os-odl-fdio-dvr-ha.yaml b/config/deploy/os-odl-fdio_dvr-ha.yaml index 6fcbec65..0304fa8b 100644 --- a/config/deploy/os-odl-fdio-dvr-ha.yaml +++ b/config/deploy/os-odl-fdio_dvr-ha.yaml @@ -4,8 +4,8 @@ global_params: deploy_options: sdn_controller: opendaylight - odl_version: carbon - odl_vpp_routing_node: dvr + odl_version: oxygen + dvr: true tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl-fdio-dvr-noha.yaml b/config/deploy/os-odl-fdio_dvr-noha.yaml index e8788d71..9424c080 100644 --- a/config/deploy/os-odl-fdio-dvr-noha.yaml +++ b/config/deploy/os-odl-fdio_dvr-noha.yaml @@ -4,8 +4,8 @@ global_params: deploy_options: sdn_controller: opendaylight - odl_version: carbon - odl_vpp_routing_node: dvr + odl_version: oxygen + dvr: true tacker: true congress: true sfc: false |