diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-10-06 12:09:36 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-10-06 17:40:00 +0400 |
| commit | fca7d22742df82fc6e502b17ad45ebc11c0ba89b (patch) | |
| tree | 72f3bb86ece8110d4646d43c8fc7e48a96f62639 /mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch | |
| parent | 2d95dee51177e66f5370b85115c2999925b13657 (diff) | |
Update opendaylight version to nitrogen
* use pseudo agentdb port binding controller instead of
the deprecated network topology one
* disable superfluous l2population mechanism driver
* tidy up the duplicated haproxy neutron listen opts
* straighten karaf features list
* update jetty config
Change-Id: Ifacf8de11eb56ab72df13a312151a510b280dea2
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch')
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch index adf07eb81..353854c1b 100644 --- a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch +++ b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch @@ -3,30 +3,17 @@ Date: Thu, 29 Jun 2017 12:22:42 +0400 Subject: [PATCH] Bring in opendaylight support Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2 ---- - neutron/control/opendaylight/cluster.yml | 19 +++++++++++++++++++ - neutron/control/opendaylight/single.yml | 16 ++++++++++++++++ - neutron/gateway/opendaylight/single.yml | 8 ++++++++ - opendaylight/server/single.yml | 2 ++ - .../storage/system/opendaylight_control_single.yml | 13 +++++++++++++ - 5 files changed, 58 insertions(+) - create mode 100644 neutron/control/opendaylight/cluster.yml - create mode 100644 neutron/control/opendaylight/single.yml - create mode 100644 neutron/gateway/opendaylight/single.yml - create mode 100644 opendaylight/server/single.yml - create mode 100644 reclass/storage/system/opendaylight_control_single.yml diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml new file mode 100644 -index 0000000..4133650 +index 0000000..81dd5f9 --- /dev/null +++ b/neutron/control/opendaylight/cluster.yml -@@ -0,0 +1,19 @@ +@@ -0,0 +1,18 @@ +classes: +- service.keepalived.cluster.single +- service.haproxy.proxy.single +- service.neutron.control.cluster -+- system.haproxy.proxy.listen.openstack.neutron +- system.neutron.control.openvswitch.cluster +parameters: + neutron: |