1 From: Michael Polenchuk <mpolenchuk@mirantis.com>
2 Date: Thu, 29 Jun 2017 12:22:42 +0400
3 Subject: [PATCH] Bring in opendaylight support
5 Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
7 diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
11 +++ b/neutron/control/opendaylight/cluster.yml
14 +- service.keepalived.cluster.single
15 +- service.haproxy.proxy.single
16 +- service.neutron.control.cluster
17 +- system.neutron.control.openvswitch.cluster
22 + engine: opendaylight
23 + host: ${_param:opendaylight_service_host}
27 + ovsdb_connection: tcp:127.0.0.1:6639
30 + driver: opendaylight_v2
31 diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
33 index 0000000..19af585
35 +++ b/neutron/control/opendaylight/single.yml
38 +- service.neutron.control.single
39 +- system.neutron.control.openvswitch.single
44 + engine: opendaylight
45 + host: ${_param:opendaylight_service_host}
49 + ovsdb_connection: tcp:127.0.0.1:6639
52 + driver: opendaylight_v2
53 diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml
55 index 0000000..29c8d95
57 +++ b/neutron/gateway/opendaylight/single.yml
60 +- service.neutron.gateway.single
65 + engine: opendaylight
66 + ovsdb_connection: tcp:127.0.0.1:6639
67 diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml
69 index 0000000..3d11872
71 +++ b/opendaylight/server/single.yml
74 +- service.opendaylight.server.single
75 diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
77 index 0000000..ad809f5
79 +++ b/reclass/storage/system/opendaylight_control_single.yml
83 + opendaylight_control_hostname: odl01
87 + opendaylight_control_node01:
88 + name: ${_param:opendaylight_control_hostname}
89 + domain: ${_param:cluster_domain}
91 + salt_master_host: ${_param:reclass_config_master}
92 + linux_system_codename: ${_param:linux_system_codename}
93 + single_address: ${_param:opendaylight_service_host}