Deprecate OpenDaylight support
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/897421 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_neutron/+/897461 Change-Id: I40ae5f158a7658cb2a6fa3b99cc64468281e5ad0
This commit is contained in:
parent
1bf1880eec
commit
4245f268fb
@ -293,12 +293,6 @@
|
|||||||
version: stable-7.0
|
version: stable-7.0
|
||||||
trackbranch: stable-7.0
|
trackbranch: stable-7.0
|
||||||
shallow_since: '2022-06-14'
|
shallow_since: '2022-06-14'
|
||||||
- name: opendaylight
|
|
||||||
scm: git
|
|
||||||
src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
|
|
||||||
version: master
|
|
||||||
trackbranch: master
|
|
||||||
shallow_since: '2019-09-14'
|
|
||||||
- name: pacemaker_corosync
|
- name: pacemaker_corosync
|
||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
|
src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
|
||||||
|
@ -51,7 +51,6 @@ each of them with specific use cases, and different sets of practices.
|
|||||||
- * https://github.com/ceph/ceph-ansible
|
- * https://github.com/ceph/ceph-ansible
|
||||||
* https://github.com/logan2211/ansible-resolvconf
|
* https://github.com/logan2211/ansible-resolvconf
|
||||||
* https://github.com/willshersystems/ansible-sshd
|
* https://github.com/willshersystems/ansible-sshd
|
||||||
* https://github.com/opendaylight/integration-packaging-ansible-opendaylight
|
|
||||||
* https://github.com/evrardjp/ansible-keepalived
|
* https://github.com/evrardjp/ansible-keepalived
|
||||||
* ...
|
* ...
|
||||||
- OpenStack-Ansible is not re-inventing the wheel, and tries to
|
- OpenStack-Ansible is not re-inventing the wheel, and tries to
|
||||||
|
@ -56,9 +56,6 @@ component_skel:
|
|||||||
neutron_ovn_northd:
|
neutron_ovn_northd:
|
||||||
belongs_to:
|
belongs_to:
|
||||||
- neutron_all
|
- neutron_all
|
||||||
opendaylight:
|
|
||||||
belongs_to:
|
|
||||||
- neutron_all
|
|
||||||
|
|
||||||
container_skel:
|
container_skel:
|
||||||
neutron_agents_container:
|
neutron_agents_container:
|
||||||
@ -84,7 +81,6 @@ container_skel:
|
|||||||
- network-infra_containers
|
- network-infra_containers
|
||||||
contains:
|
contains:
|
||||||
- neutron_server
|
- neutron_server
|
||||||
- opendaylight
|
|
||||||
neutron_ovn_gateway_container:
|
neutron_ovn_gateway_container:
|
||||||
belongs_to:
|
belongs_to:
|
||||||
- network-gateway_containers
|
- network-gateway_containers
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
haproxy_opendaylight_allowlist_networks: "{{ haproxy_allowlist_networks }}"
|
|
||||||
|
|
||||||
haproxy_neutron_server_service:
|
haproxy_neutron_server_service:
|
||||||
haproxy_service_name: neutron_server
|
haproxy_service_name: neutron_server
|
||||||
haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
|
haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
|
||||||
@ -29,37 +27,5 @@ haproxy_neutron_server_service:
|
|||||||
haproxy_accept_both_protocols: "{{ neutron_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
|
haproxy_accept_both_protocols: "{{ neutron_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
|
||||||
haproxy_service_enabled: "{{ groups['neutron_server'] is defined and groups['neutron_server'] | length > 0 }}"
|
haproxy_service_enabled: "{{ groups['neutron_server'] is defined and groups['neutron_server'] | length > 0 }}"
|
||||||
|
|
||||||
haproxy_opendaylight_neutron_service:
|
|
||||||
haproxy_service_name: opendaylight-neutron
|
|
||||||
haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
|
|
||||||
haproxy_bind: >-
|
|
||||||
{{ [{
|
|
||||||
'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
|
|
||||||
'interface': haproxy_bind_internal_lb_vip_interface | default('')
|
|
||||||
}] }}
|
|
||||||
haproxy_port: 8180
|
|
||||||
haproxy_balance_type: tcp
|
|
||||||
haproxy_timeout_client: 5000s
|
|
||||||
haproxy_timeout_server: 5000s
|
|
||||||
haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}"
|
|
||||||
haproxy_service_enabled: "{{ (neutron_plugin_type | default('ml2.ovn') == 'ml2.opendaylight') }}"
|
|
||||||
|
|
||||||
haproxy_opendaylight_websocket_service:
|
|
||||||
haproxy_service_name: opendaylight-websocket
|
|
||||||
haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
|
|
||||||
haproxy_bind: >-
|
|
||||||
{{ [{
|
|
||||||
'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
|
|
||||||
'interface': haproxy_bind_internal_lb_vip_interface | default('')
|
|
||||||
}] }}
|
|
||||||
haproxy_port: 8185
|
|
||||||
haproxy_balance_type: tcp
|
|
||||||
haproxy_timeout_client: 5000s
|
|
||||||
haproxy_timeout_server: 5000s
|
|
||||||
haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}"
|
|
||||||
haproxy_service_enabled: "{{ (neutron_plugin_type | default('ml2.ovn') == 'ml2.opendaylight') }}"
|
|
||||||
|
|
||||||
neutron_haproxy_services:
|
neutron_haproxy_services:
|
||||||
- "{{ haproxy_neutron_server_service | combine(haproxy_neutron_server_service_overrides | default({})) }}"
|
- "{{ haproxy_neutron_server_service | combine(haproxy_neutron_server_service_overrides | default({})) }}"
|
||||||
- "{{ haproxy_opendaylight_neutron_service | combine(haproxy_opendaylight_neutron_service_overrides | default({})) }}"
|
|
||||||
- "{{ haproxy_opendaylight_websocket_service | combine(haproxy_opendaylight_websocket_service_overrides | default({})) }}"
|
|
||||||
|
@ -411,7 +411,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
|
|||||||
'nova_conductor',
|
'nova_conductor',
|
||||||
'nova_console',
|
'nova_console',
|
||||||
'nova_scheduler',
|
'nova_scheduler',
|
||||||
'opendaylight',
|
|
||||||
'operator_containers',
|
'operator_containers',
|
||||||
'operator_hosts',
|
'operator_hosts',
|
||||||
'orchestration_all',
|
'orchestration_all',
|
||||||
|
Loading…
Reference in New Issue
Block a user