Merge "Remove remaining implementations for OpenDaylight"

This commit is contained in:
Zuul 2020-09-26 05:44:14 +00:00 committed by Gerrit Code Review
commit a1f6b04d1e
4 changed files with 4 additions and 44 deletions

View File

@ -20,9 +20,9 @@ parameter_defaults:
default_tag: True
rhel_containers: false
# Substitute neutron images based on driver. Can be 'other', 'ovn' or
# 'odl'. This is usually set automatically by detecting if odl or ovn
# services are deployed.
# Substitute neutron images based on driver. Can be 'other' or 'ovn'.
# This is usually set automatically by detecting if ovn services are
# deployed.
neutron_driver: 'ovn'
# Container image name components for Ceph images.

View File

@ -1,14 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
file=/opt/opendaylight/etc/org.ops4j.pax.web.cfg
bind_host=$(wrap_ipv6 $(awk -F "= *" '/^org.ops4j.pax.web.listening.addresses/ {print $2}' $file))
tls_enabled=$(awk -F "= *" '/^org.osgi.service.http.secure.enabled/ {print $2}' $file)
if [[ -z "$tls_enabled" || "$tls_enabled" != "true" ]]; then
bind_port=$(awk -F "= *" '/^org.osgi.service.http.port\s*=/ {print $2}' $file)
else
bind_port=$(awk -F "= *" '/^org.osgi.service.http.port.secure/ {print $2}' $file)
fi
healthcheck_curl http://$bind_host:$bind_port/diagstatus

View File

@ -1,23 +0,0 @@
disk_images:
-
imagename: overcloud-odl
builder: dib
type: qcow2
distro: rhel7
elements:
- sysctl
- baremetal
- dhcp-all-interfaces
- openvswitch
- os-collect-config
- puppet-modules
- stable-interface-names
- grub2-deprecated
packages:
- java-1.8.0-openjdk
- ntp
- opendaylight
- openstack-heat-agents
- os-net-config
- jq
options:

View File

@ -475,9 +475,6 @@ workflows:
# The role supports the DPDK feature if the NeutronDatapathType parameter is present
dpdk: <% let(resources => $.heat_resource_tree.resources) -> $.role_services.any($.get('parameters', []).contains('NeutronDatapathType') or $.get('resources', []).select($resources.get($)).any($.get('parameters', []).contains('NeutronDatapathType'))) %>
# The role supports the DPDK feature in ODL if the OvsEnableDpdk parameter value is true in role parameters.
odl_dpdk: <% let(role => $.role_name) -> $.heat_resource_tree.parameters.get(concat($role, 'Parameters'), {}).get('default', {}).get('OvsEnableDpdk', false) %>
# The role supports the SRIOV feature if it includes NeutronSriovAgent services.
sriov: <% $.role_services.any($.get('type', '').endsWith('::NeutronSriovAgent')) %>
@ -487,7 +484,7 @@ workflows:
build_feature_dict:
on-success: filter_features
publish:
feature_dict: <% dict(DPDK => ($.dpdk or $.odl_dpdk), SRIOV => $.sriov, HOST => ($.dpdk or $.odl_dpdk or $.sriov), HCI => $.hci) %>
feature_dict: <% dict(DPDK => $.dpdk, SRIOV => $.sriov, HOST => $.dpdk or $.sriov), HCI => $.hci) %>
filter_features:
publish: