From 3f6ffb9d83975abb4592db54531c26b4c1ad6383 Mon Sep 17 00:00:00 2001
From: jacky06 <zhang.min@99cloud.net>
Date: Tue, 7 Jul 2020 23:41:12 +0800
Subject: [PATCH] Remove opendaylight support
It has been deprecated in Ussuri cycle.
Change-Id: I01da8af2255e2ac4751279db712292f9b862adad
---
ansible/roles/kolla-ansible/templates/globals.yml.j2 | 6 ------
ansible/roles/kolla-ansible/vars/main.yml | 1 -
etc/kayobe/kolla.yml | 1 -
.../notes/remove-opendaylight-ac316f8ada083cc9.yaml | 5 +++++
4 files changed, 5 insertions(+), 8 deletions(-)
create mode 100644 releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml
diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 29521581..24efaa83 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -195,12 +195,6 @@ kolla_internal_fqdn_cacert: "{{ kolla_internal_fqdn_cacert }}"
# in a multi-region deployment, and then only in the *first* region.
#multiple_regions_names: ["{% raw %}{{ openstack_region_name }}{% endraw %}"]
-##############
-# OpenDaylight
-##############
-#enable_opendaylight_qos: "no"
-#enable_opendaylight_l3: "yes"
-
###################
# OpenStack options
###################
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 27ab2cf1..ccf13989 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -172,7 +172,6 @@ kolla_feature_flags:
- nova_ssh
- octavia
- onos
- - opendaylight
- openstack_core
- openvswitch
- osprofiler
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 8afe636d..81f54e98 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -285,7 +285,6 @@
#kolla_enable_nova_ssh:
#kolla_enable_octavia:
#kolla_enable_onos:
-#kolla_enable_opendaylight:
#kolla_enable_openstack_core:
#kolla_enable_openvswitch:
#kolla_enable_osprofiler:
diff --git a/releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml b/releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml
new file mode 100644
index 00000000..e95871dc
--- /dev/null
+++ b/releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ The ``opendaylight`` service, which was deprecated in the Ussuri cycle, has
+ been removed.
--
GitLab