diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2 index 2952158183f7c915cdd18f8af847eda7931508e1..24efaa83041eca578957cc76877a6e56adf479d8 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 27ab2cf1b81e3fafdd3ca58a957b89c726c14d5d..ccf13989995dac342c84689801ee4a5470d266a0 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 8afe636db99232b6974fe9a934e35f3c283e89c5..81f54e98e734521a3df2eb657213b55fb7fbd85f 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 0000000000000000000000000000000000000000..e95871dc4561545a4b525f2a7a270b096952ecc9 --- /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.