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.haproxy.proxy.listen.openstack.neutron
18 +- system.neutron.control.openvswitch.cluster
23 + engine: opendaylight
24 + host: ${_param:opendaylight_service_host}
28 + ovsdb_connection: tcp:127.0.0.1:6639
31 + driver: opendaylight_v2
32 diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
34 index 0000000..19af585
36 +++ b/neutron/control/opendaylight/single.yml
39 +- service.neutron.control.single
40 +- system.neutron.control.openvswitch.single
45 + engine: opendaylight
46 + host: ${_param:opendaylight_service_host}
50 + ovsdb_connection: tcp:127.0.0.1:6639
53 + driver: opendaylight_v2
54 diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml
56 index 0000000..29c8d95
58 +++ b/neutron/gateway/opendaylight/single.yml
61 +- service.neutron.gateway.single
66 + engine: opendaylight
67 + ovsdb_connection: tcp:127.0.0.1:6639
68 diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml
70 index 0000000..3d11872
72 +++ b/opendaylight/server/single.yml
75 +- service.opendaylight.server.single
76 diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
78 index 0000000..890ff59
80 +++ b/reclass/storage/system/opendaylight_control_single.yml
84 + opendaylight_control_hostname: odl01
88 + opendaylight_control_node01:
89 + name: ${_param:opendaylight_control_hostname}
90 + domain: ${_param:cluster_domain}
92 + - cluster.${_param:cluster_name}.opendaylight.control
94 + salt_master_host: ${_param:reclass_config_master}
95 + linux_system_codename: ${_param:linux_system_codename}
96 + single_address: ${_param:opendaylight_service_host}