Merge "Remove Neutron integration with ONOS"
This commit is contained in:
commit
58968223db
@ -634,7 +634,6 @@ enable_neutron_port_forwarding: "no"
|
|||||||
enable_nova_serialconsole_proxy: "no"
|
enable_nova_serialconsole_proxy: "no"
|
||||||
enable_nova_ssh: "yes"
|
enable_nova_ssh: "yes"
|
||||||
enable_octavia: "no"
|
enable_octavia: "no"
|
||||||
enable_onos: "no"
|
|
||||||
enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
|
enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
|
||||||
enable_ovs_dpdk: "no"
|
enable_ovs_dpdk: "no"
|
||||||
enable_osprofiler: "no"
|
enable_osprofiler: "no"
|
||||||
|
@ -28,7 +28,7 @@ neutron_services:
|
|||||||
neutron-openvswitch-agent:
|
neutron-openvswitch-agent:
|
||||||
container_name: "neutron_openvswitch_agent"
|
container_name: "neutron_openvswitch_agent"
|
||||||
image: "{{ neutron_openvswitch_agent_image_full }}"
|
image: "{{ neutron_openvswitch_agent_image_full }}"
|
||||||
enabled: "{{ neutron_plugin_agent == 'openvswitch' and not enable_onos | bool }}"
|
enabled: "{{ neutron_plugin_agent == 'openvswitch' }}"
|
||||||
privileged: True
|
privileged: True
|
||||||
environment:
|
environment:
|
||||||
KOLLA_LEGACY_IPTABLES: "{{ neutron_legacy_iptables | bool | lower }}"
|
KOLLA_LEGACY_IPTABLES: "{{ neutron_legacy_iptables | bool | lower }}"
|
||||||
@ -84,7 +84,7 @@ neutron_services:
|
|||||||
container_name: "neutron_dhcp_agent"
|
container_name: "neutron_dhcp_agent"
|
||||||
image: "{{ neutron_dhcp_agent_image_full }}"
|
image: "{{ neutron_dhcp_agent_image_full }}"
|
||||||
privileged: True
|
privileged: True
|
||||||
enabled: "{{ neutron_plugin_agent not in [ 'vmware_nsxv', 'vmware_nsxv3' ] and not enable_onos | bool }}"
|
enabled: "{{ neutron_plugin_agent not in [ 'vmware_nsxv', 'vmware_nsxv3' ] }}"
|
||||||
group: "neutron-dhcp-agent"
|
group: "neutron-dhcp-agent"
|
||||||
host_in_groups: "{{ inventory_hostname in groups['neutron-dhcp-agent'] }}"
|
host_in_groups: "{{ inventory_hostname in groups['neutron-dhcp-agent'] }}"
|
||||||
volumes: "{{ neutron_dhcp_agent_default_volumes + neutron_dhcp_agent_extra_volumes }}"
|
volumes: "{{ neutron_dhcp_agent_default_volumes + neutron_dhcp_agent_extra_volumes }}"
|
||||||
@ -93,7 +93,7 @@ neutron_services:
|
|||||||
container_name: "neutron_l3_agent"
|
container_name: "neutron_l3_agent"
|
||||||
image: "{{ neutron_l3_agent_image_full }}"
|
image: "{{ neutron_l3_agent_image_full }}"
|
||||||
privileged: True
|
privileged: True
|
||||||
enabled: "{{ neutron_plugin_agent not in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs'] and not enable_onos | bool }}"
|
enabled: "{{ neutron_plugin_agent not in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs'] }}"
|
||||||
environment:
|
environment:
|
||||||
KOLLA_LEGACY_IPTABLES: "{{ neutron_legacy_iptables | bool | lower }}"
|
KOLLA_LEGACY_IPTABLES: "{{ neutron_legacy_iptables | bool | lower }}"
|
||||||
host_in_groups: >-
|
host_in_groups: >-
|
||||||
@ -115,7 +115,7 @@ neutron_services:
|
|||||||
container_name: "neutron_metadata_agent"
|
container_name: "neutron_metadata_agent"
|
||||||
image: "{{ neutron_metadata_agent_image_full }}"
|
image: "{{ neutron_metadata_agent_image_full }}"
|
||||||
privileged: True
|
privileged: True
|
||||||
enabled: "{{ neutron_plugin_agent not in [ 'vmware_nsxv', 'vmware_nsxv3' ] and not enable_onos | bool }}"
|
enabled: "{{ neutron_plugin_agent not in [ 'vmware_nsxv', 'vmware_nsxv3' ] }}"
|
||||||
host_in_groups: >-
|
host_in_groups: >-
|
||||||
{{
|
{{
|
||||||
inventory_hostname in groups['neutron-metadata-agent']
|
inventory_hostname in groups['neutron-metadata-agent']
|
||||||
@ -488,12 +488,6 @@ notification_drivers: []
|
|||||||
|
|
||||||
neutron_notification_drivers: "{{ notification_drivers|selectattr('enabled', 'equalto', true)|list }}"
|
neutron_notification_drivers: "{{ notification_drivers|selectattr('enabled', 'equalto', true)|list }}"
|
||||||
|
|
||||||
############
|
|
||||||
# Onos
|
|
||||||
############
|
|
||||||
onos_url: "127.0.0.1"
|
|
||||||
onos_username: "username"
|
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# Kolla
|
# Kolla
|
||||||
####################
|
####################
|
||||||
|
@ -11,8 +11,6 @@ overlay_ip_version = 6
|
|||||||
{% if neutron_plugin_agent == "openvswitch" %}
|
{% if neutron_plugin_agent == "openvswitch" %}
|
||||||
{% if enable_hyperv | bool %}
|
{% if enable_hyperv | bool %}
|
||||||
mechanism_drivers = openvswitch,hyperv
|
mechanism_drivers = openvswitch,hyperv
|
||||||
{% elif enable_onos | bool %}
|
|
||||||
mechanism_drivers = onos_ml2
|
|
||||||
{% else %}
|
{% else %}
|
||||||
mechanism_drivers = openvswitch,{% if enable_ironic_neutron_agent | bool %}baremetal,{% endif %}l2population
|
mechanism_drivers = openvswitch,{% if enable_ironic_neutron_agent | bool %}baremetal,{% endif %}l2population
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -26,13 +24,6 @@ extension_drivers = {{ neutron_extension_drivers|map(attribute='name')|join(',')
|
|||||||
extension_drivers = port_security
|
extension_drivers = port_security
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if enable_onos | bool %}
|
|
||||||
[onos]
|
|
||||||
url_path = {{ onos_url }}
|
|
||||||
username = {{ onos_username }}
|
|
||||||
password = {{ onos_password }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
[ml2_type_vlan]
|
[ml2_type_vlan]
|
||||||
{% if enable_ironic | bool %}
|
{% if enable_ironic | bool %}
|
||||||
network_vlan_ranges = physnet1
|
network_vlan_ranges = physnet1
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
when:
|
when:
|
||||||
- inventory_hostname in groups["network"]
|
- inventory_hostname in groups["network"]
|
||||||
or (inventory_hostname in groups["compute"] and computes_need_external_bridge | bool )
|
or (inventory_hostname in groups["compute"] and computes_need_external_bridge | bool )
|
||||||
- not enable_onos | bool
|
|
||||||
with_together:
|
with_together:
|
||||||
- "{{ neutron_bridge_name.split(',') }}"
|
- "{{ neutron_bridge_name.split(',') }}"
|
||||||
- "{{ neutron_external_interface.split(',') }}"
|
- "{{ neutron_external_interface.split(',') }}"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"command": "start-ovsdb-server {% if enable_onos | bool %} 0.0.0.0 {% else %} 127.0.0.1 {% endif %}",
|
"command": "start-ovsdb-server 127.0.0.1",
|
||||||
"config_files": [
|
"config_files": [
|
||||||
{
|
{
|
||||||
"source": "{{ container_config_directory }}/start-ovsdb-server",
|
"source": "{{ container_config_directory }}/start-ovsdb-server",
|
||||||
|
@ -313,7 +313,6 @@
|
|||||||
#enable_nova_serialconsole_proxy: "no"
|
#enable_nova_serialconsole_proxy: "no"
|
||||||
#enable_nova_ssh: "yes"
|
#enable_nova_ssh: "yes"
|
||||||
#enable_octavia: "no"
|
#enable_octavia: "no"
|
||||||
#enable_onos: "no"
|
|
||||||
#enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
|
#enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
|
||||||
#enable_ovs_dpdk: "no"
|
#enable_ovs_dpdk: "no"
|
||||||
#enable_osprofiler: "no"
|
#enable_osprofiler: "no"
|
||||||
|
@ -267,8 +267,3 @@ xenserver_password:
|
|||||||
####################
|
####################
|
||||||
prometheus_mysql_exporter_database_password:
|
prometheus_mysql_exporter_database_password:
|
||||||
prometheus_alertmanager_password:
|
prometheus_alertmanager_password:
|
||||||
|
|
||||||
############
|
|
||||||
# Onos
|
|
||||||
############
|
|
||||||
onos_password:
|
|
||||||
|
5
releasenotes/notes/remove-onos-178adb66092d4da5.yaml
Normal file
5
releasenotes/notes/remove-onos-178adb66092d4da5.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Support for configuration of Neutron related to integration with ONOS
|
||||||
|
has been removed.
|
Loading…
Reference in New Issue
Block a user