From e8b6d6debe2b056b404fc353f54b67364b58c59d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 10 Oct 2016 17:11:20 -0400 Subject: Migrate to stable/newton os-odl_l2_nofeature is now deprecated since new netvirt only supports odl_l3. JIRA: APEX-299 Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00 Signed-off-by: Tim Rozet --- config/deploy/os-odl_l2-nofeature-ha.yaml | 12 +----------- config/deploy/os-odl_l3-nofeature-ha.yaml | 1 + config/deploy/os-odl_l3-nofeature-noha.yaml | 11 +++++++++++ 3 files changed, 13 insertions(+), 11 deletions(-) mode change 100644 => 120000 config/deploy/os-odl_l2-nofeature-ha.yaml create mode 100644 config/deploy/os-odl_l3-nofeature-noha.yaml (limited to 'config') diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml deleted file mode 100644 index 4c88eeb3..00000000 --- a/config/deploy/os-odl_l2-nofeature-ha.yaml +++ /dev/null @@ -1,11 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - odl_version: beryllium - tacker: true - congress: true - sfc: false - vpn: false diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml new file mode 120000 index 00000000..dc20f6fe --- /dev/null +++ b/config/deploy/os-odl_l2-nofeature-ha.yaml @@ -0,0 +1 @@ +os-odl_l3-nofeature-ha.yaml \ No newline at end of file diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml index e54f28b0..d421c7ca 100644 --- a/config/deploy/os-odl_l3-nofeature-ha.yaml +++ b/config/deploy/os-odl_l3-nofeature-ha.yaml @@ -3,6 +3,7 @@ global_params: deploy_options: sdn_controller: opendaylight + odl_version: boron sdn_l3: true tacker: true congress: true diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml new file mode 100644 index 00000000..972b1f85 --- /dev/null +++ b/config/deploy/os-odl_l3-nofeature-noha.yaml @@ -0,0 +1,11 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + odl_version: boron + sdn_l3: true + tacker: true + congress: true + sfc: false + vpn: false -- cgit 1.2.3-korg