summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-11-27 15:36:22 -0500
committerTim Rozet <trozet@redhat.com>2017-11-27 15:36:22 -0500
commit2c26b89b546983ec2621f6dce8715873fe6ab774 (patch)
tree9763af8b1cef0d3bffc9948561eef1724751ccc6 /config/deploy
parentaa40079de9af3f11e05d79aa426cd491661cd64d (diff)
Migrate default ODL from Carbon -> Nitrogen
Change-Id: If64212b33bf9ad3b9900ca18b39c90839f745843 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/deploy_settings.yaml6
-rw-r--r--config/deploy/os-odl-bgpvpn-ha.yaml2
-rw-r--r--config/deploy/os-odl-bgpvpn-noha.yaml2
-rw-r--r--config/deploy/os-odl-csit-noha.yaml2
-rw-r--r--config/deploy/os-odl-gluon-noha.yaml2
-rw-r--r--config/deploy/os-odl-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-odl-nofeature-noha.yaml2
-rw-r--r--config/deploy/os-odl-ovs_dpdk-ha.yaml2
-rw-r--r--config/deploy/os-odl-ovs_dpdk-noha.yaml2
-rw-r--r--config/deploy/os-odl_netvirt-fdio-noha.yaml2
10 files changed, 12 insertions, 12 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 45324c4..47bf083 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -15,9 +15,9 @@ deploy_options:
sdn_controller: opendaylight
# Which version of ODL to use. This is only valid if 'opendaylight' was used
- # above. Valid options are 'carbon'. If no value
- # is specified, carbon will be used.
- # odl_version: carbon
+ # above. Valid options are 'nitrogen', 'oxygen'. If no value
+ # is specified, nitrogen will be used.
+ # odl_version: nitrogen
# Whether to install and configure Tacker (VNF Manager)
tacker: true
diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
index 424ac64..68b6273 100644
--- a/config/deploy/os-odl-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn-ha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: false
congress: true
sfc: false
diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml
index 53510a8..0435e6b 100644
--- a/config/deploy/os-odl-bgpvpn-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: false
congress: true
sfc: false
diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml
index 661cc00..634b6cb 100644
--- a/config/deploy/os-odl-csit-noha.yaml
+++ b/config/deploy/os-odl-csit-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: false
congress: false
sfc: false
diff --git a/config/deploy/os-odl-gluon-noha.yaml b/config/deploy/os-odl-gluon-noha.yaml
index b7e2e05..480d5ae 100644
--- a/config/deploy/os-odl-gluon-noha.yaml
+++ b/config/deploy/os-odl-gluon-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: false
congress: true
sfc: false
diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index bab9d0e..4dd31e9 100644
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: true
congress: true
sfc: false
diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 32014d0..271d271 100644
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: true
congress: true
sfc: false
diff --git a/config/deploy/os-odl-ovs_dpdk-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml
index a314f8c..efdecea 100644
--- a/config/deploy/os-odl-ovs_dpdk-ha.yaml
+++ b/config/deploy/os-odl-ovs_dpdk-ha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: true
congress: true
sfc: false
diff --git a/config/deploy/os-odl-ovs_dpdk-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml
index 8a09ffa..4b78605 100644
--- a/config/deploy/os-odl-ovs_dpdk-noha.yaml
+++ b/config/deploy/os-odl-ovs_dpdk-noha.yaml
@@ -4,7 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
- odl_version: carbon
+ odl_version: nitrogen
tacker: true
congress: true
sfc: false
diff --git a/config/deploy/os-odl_netvirt-fdio-noha.yaml b/config/deploy/os-odl_netvirt-fdio-noha.yaml
index 6cf8c1a..3e88baa 100644
--- a/config/deploy/os-odl_netvirt-fdio-noha.yaml
+++ b/config/deploy/os-odl_netvirt-fdio-noha.yaml
@@ -5,7 +5,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
sdn_l3: true
- odl_version: carbon
+ odl_version: nitrogen
odl_vpp_netvirt: true
odl_vpp_routing_node: overcloud-novacompute-0
tacker: true