1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Mirantis Inc., Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Michael Polenchuk <mpolenchuk@mirantis.com>
10 Date: Thu, 29 Jun 2017 12:22:42 +0400
11 Subject: [PATCH] Bring in opendaylight support
13 Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
15 diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
17 index 00000000..a32e7abb
19 +++ b/neutron/control/opendaylight/cluster.yml
22 +- service.keepalived.cluster.single
23 +- service.haproxy.proxy.single
24 +- service.neutron.control.cluster
25 +- system.neutron.control.openvswitch.cluster
30 + host: ${_param:opendaylight_service_host}
34 + ovsdb_connection: tcp:127.0.0.1:6639
37 + driver: opendaylight_v2
38 diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
40 index 00000000..053f14df
42 +++ b/neutron/control/opendaylight/single.yml
45 +- service.neutron.control.single
46 +- system.neutron.control.openvswitch.single
51 + host: ${_param:opendaylight_service_host}
55 + ovsdb_connection: tcp:127.0.0.1:6639
58 + driver: opendaylight_v2
59 diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml
61 index 00000000..21690017
63 +++ b/neutron/gateway/opendaylight/single.yml
66 +- service.neutron.gateway.single
71 + ovsdb_connection: tcp:127.0.0.1:6639
72 diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml
74 index 00000000..3d11872c
76 +++ b/opendaylight/server/single.yml
79 +- service.opendaylight.server.single
80 diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
82 index 00000000..ad809f59
84 +++ b/reclass/storage/system/opendaylight_control_single.yml
88 + opendaylight_control_hostname: odl01
92 + opendaylight_control_node01:
93 + name: ${_param:opendaylight_control_hostname}
94 + domain: ${_param:cluster_domain}
96 + salt_master_host: ${_param:reclass_config_master}
97 + linux_system_codename: ${_param:linux_system_codename}
98 + single_address: ${_param:opendaylight_service_host}