Migrate default ODL from Carbon -> Nitrogen

Change-Id: If64212b33bf9ad3b9900ca18b39c90839f745843
Signed-off-by: Tim Rozet <trozet@redhat.com>

10 files changed, 12 insertions, 12 deletions

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 45324c4b..47bf0834 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 424ac64f..68b62734 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 53510a8f..0435e6b5 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 661cc00d..634b6cb5 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 b7e2e05e..480d5aea 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 bab9d0ee..4dd31e9e 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 32014d05..271d2717 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 a314f8c7..efdecea9 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 8a09ffa5..4b786058 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 6cf8c1a6..3e88baa2 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