summaryrefslogtreecommitdiffstats
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
parentaa40079de9af3f11e05d79aa426cd491661cd64d (diff)
Migrate default ODL from Carbon -> Nitrogen
Change-Id: If64212b33bf9ad3b9900ca18b39c90839f745843 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--apex/common/constants.py2
-rwxr-xr-xbuild/overcloud-opendaylight.sh22
-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
12 files changed, 17 insertions, 31 deletions
diff --git a/apex/common/constants.py b/apex/common/constants.py
index b4b24eb..a2b9a63 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -41,7 +41,7 @@ THT_DIR = '/usr/share/openstack-tripleo-heat-templates'
THT_ENV_DIR = os.path.join(THT_DIR, 'environments')
DEFAULT_OS_VERSION = 'pike'
-DEFAULT_ODL_VERSION = 'carbon'
+DEFAULT_ODL_VERSION = 'nitrogen'
VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \
'/puppet-opendaylight'
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 024c6a5..9e85859 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -20,14 +20,6 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
###############################################
cat > ${BUILD_DIR}/opendaylight.repo << EOF
-[opendaylight-6-release]
-name=CentOS CBS OpenDaylight Carbon repository
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/\$basearch/os/
-enabled=1
-gpgcheck=0
-EOF
-
-cat > ${BUILD_DIR}/opendaylight_nitrogen.repo << EOF
[opendaylight-7-release]
name=CentOS CBS OpenDaylight Nitrogen repository
baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-7-testing/\$basearch/os/
@@ -45,13 +37,11 @@ EOF
# OpenDaylight Puppet Module
rm -rf puppet-opendaylight
-git clone -b stable/carbon https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight
+git clone -b stable/nitrogen https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight
pushd puppet-opendaylight > /dev/null
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz
+git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz
git checkout master
git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz
-git checkout stable/nitrogen
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz
popd > /dev/null
# cache gluon
@@ -75,15 +65,11 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \
--run-command "mkdir -p /root/master" \
--run-command "yumdownloader --destdir=/root/master opendaylight" \
- --upload ${BUILD_DIR}/opendaylight_nitrogen.repo:/etc/yum.repos.d/opendaylight.repo \
- --run-command "mkdir -p /root/nitrogen" \
- --run-command "yum install --downloadonly --downloaddir=/root/nitrogen opendaylight" \
--upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
--install opendaylight,python-networking-odl \
- --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/etc/puppet/modules/ \
- --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-carbon.tar.gz" \
+ --upload ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz:/etc/puppet/modules/ \
+ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-nitrogen.tar.gz" \
--upload ${BUILD_DIR}/puppet-opendaylight-master.tar.gz:/root/ \
- --upload ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz:/root/ \
--upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \
--install python-click \
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