diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-29 05:07:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 05:07:09 +0000 |
| commit | 91d2f2eab07cbbee17409c2660ecad3da2013d91 (patch) | |
| tree | b36671f5e1a2010da95dbb9d1902913570d27961 /config | |
| parent | 82460b8ed466cac2d97bd89f7072e3b13a0c5b41 (diff) | |
| parent | a3c2c8c746470c993d70d92d13415e2b4263cc25 (diff) | |
Merge "re-enable support for fdio dvr scenario"
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 |