wait_for 5.0 "salt -I 'opendaylight:server' state.sls opendaylight"
wait_for 20 "salt --out yaml -C 'I@neutron:server and *01*' network.connect $(odl bind_ip) $(odl rest_port) | fgrep -q 'result: true'"
+
+# https://bugs.launchpad.net/networking-odl/+bug/1822559
+salt -I 'linux:network:bridge:openvswitch' pkg.install python3-networking-odl
+salt -I 'linux:network:bridge:openvswitch' file.patch /usr/lib/python3/dist-packages/networking_odl/cmd/set_ovs_hostconfigs.py /var/tmp/odl_hostconfig.patch || true
router_enabled: true
netvirt_natservice:
nat_mode: conntrack
- snat_punt_timeout: 0
karaf_features:
odl_default:
- odl-restconf-all
router_enabled: true
netvirt_natservice:
nat_mode: conntrack
- snat_punt_timeout: 0
karaf_features:
odl_default:
- odl-restconf-all
name_servers: {{ nm.dns_public }}
noifupdown: true
{%- endif %}
+ system:
+ file:
+ /var/tmp/odl_hostconfig.patch:
+ contents: |
+ 420c420
+ < if datapath_types.find(datapath_type) >= 0)
+ ---
+ > if datapath_type in datapath_types)
+ 460c460
+ < return subprocess.check_output(command_line).strip() # nosec
+ ---
+ > return subprocess.check_output(command_line).strip().decode() # nosec
use_interfaces:
- {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }}
{%- endif %}
+ system:
+ file:
+ /var/tmp/odl_hostconfig.patch:
+ contents: |
+ 420c420
+ < if datapath_types.find(datapath_type) >= 0)
+ ---
+ > if datapath_type in datapath_types)
+ 460c460
+ < return subprocess.check_output(command_line).strip() # nosec
+ ---
+ > return subprocess.check_output(command_line).strip().decode() # nosec
- service.haproxy.proxy.single
parameters:
_param:
- opendaylight_version: fluorine
+ opendaylight_version: neon
cluster_vip_address: ${_param:opendaylight_service_host}
keepalived_vip_virtual_router_id: 199
keepalived_vip_password: ${_param:opnfv_main_password}
version: ${_param:opendaylight_version}
repo: 'odl-team/${_param:opendaylight_version}'
cluster_enabled: true
- logging:
- engine: syslog
keepalived:
cluster:
vrrp_scripts:
- opendaylight
parameters:
_param:
- opendaylight_version: fluorine
+ opendaylight_version: neon
opendaylight:
server:
enabled: 'True'
version: ${_param:opendaylight_version}
repo: 'odl-team/${_param:opendaylight_version}'
- logging:
- engine: syslog
# https://github.com/saltstack/salt/pull/45224
# - ppa: {{ server.repo }}
- human_name: opendaylight-ppa
- - name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main
- - file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list
+ - name: deb http://ppa.launchpad.net/{{ server.repo }}/ubuntu {{ grains.oscodename }} main
+ - file: /etc/apt/sources.list.d/odl-team-{{ server.version }}.list