10 files changed, 12 insertions, 12 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index aedd1979..3186a5da 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -14,9 +14,9 @@ deploy_options:
   sdn_controller: opendaylight
 
   # Which version of ODL to use. This is only valid if 'opendaylight' was used
-  # above. Valid options are 'beryllium', 'boron' and 'carbon'. If no value
-  # is specified, Beryllium will be used.
-  #odl_version: boron
+  # above. Valid options are 'carbon'. If no value
+  # is specified, carbon will be used.
+  #odl_version: carbon
 
   # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent and
   # use ODL instead.
diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
index ef51e737..76d051eb 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
   sdn_l3: true
-  odl_version: boron
+  odl_version: carbon
   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 7812d054..d569ba6c 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
   sdn_l3: true
-  odl_version: boron
+  odl_version: carbon
   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 ad61e26b..d5e2695e 100644
--- a/config/deploy/os-odl-csit-noha.yaml
+++ b/config/deploy/os-odl-csit-noha.yaml
@@ -3,7 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: boron
+  odl_version: carbon
   sdn_l3: true
   tacker: false
   congress: false
diff --git a/config/deploy/os-odl-gluon-noha.yaml b/config/deploy/os-odl-gluon-noha.yaml
index cdeb90c5..12e5d25f 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
   sdn_l3: true
-  odl_version: boron
+  odl_version: carbon
   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 d421c7ca..64af606a 100644
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -3,7 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: boron
+  odl_version: carbon
   sdn_l3: true
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 972b1f85..d95ed9c6 100644
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -3,7 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: boron
+  odl_version: carbon
   sdn_l3: true
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl-ovs_dpdk-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml
index ad265699..8e3674a0 100644
--- a/config/deploy/os-odl-ovs_dpdk-ha.yaml
+++ b/config/deploy/os-odl-ovs_dpdk-ha.yaml
@@ -3,7 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: boron
+  odl_version: carbon
   sdn_l3: true
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl-ovs_dpdk-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml
index 6f7630dc..1711fc63 100644
--- a/config/deploy/os-odl-ovs_dpdk-noha.yaml
+++ b/config/deploy/os-odl-ovs_dpdk-noha.yaml
@@ -3,7 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  odl_version: boron
+  odl_version: carbon
   sdn_l3: true
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml
index fa9a7868..4423b175 100644
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ b/config/deploy/os-odl_l2-sfc-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
-  odl_version: boron
+  odl_version: carbon
   tacker: true
   congress: true
   sfc: true