aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-05 20:47:05 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-05 21:53:52 +0400
commit7d67464f9e33659de42ac4f1591f7a2cdc5bd178 (patch)
treec7fa7d79e6603130fe9b8154ca425d6ec8af9f0f /mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack
parent5e5e35e0cc0cf0abe1fd4a8d0cee8d6541a7f81b (diff)
Align opendaylight settings with upstream
Change-Id: If7d51555bc13dbcaa63f93ab1993f3655e2ce643 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml7
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml18
3 files changed, 2 insertions, 27 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
index dd9066dc5..faf51fd6d 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
@@ -8,15 +8,10 @@
---
classes:
- service.neutron.compute.single
+ - service.compute.opendaylight.single
- cluster.mcp-pike-common-noha.openstack_compute
- cluster.mcp-pike-odl-noha
parameters:
- opendaylight:
- client:
- ovsdb_server_iface: ptcp:6639:127.0.0.1
- ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
- tunnel_ip: ${_param:tenant_address}
- provider_mappings: physnet1:br-floating
linux:
network:
gateway: ${_param:openstack_gateway_address}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
index c52fe3436..1856c3eb9 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
@@ -11,10 +11,6 @@ classes:
- cluster.mcp-pike-common-noha.openstack_control
- cluster.mcp-pike-odl-noha
parameters:
- neutron:
- server:
- backend:
- router: ${_param:opendaylight_router}
haproxy:
proxy:
listen:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
index d85fbd72a..d92f1ab6d 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
@@ -8,25 +8,9 @@
---
classes:
- cluster.mcp-pike-common-noha.openstack_gateway
- - system.neutron.gateway.opendaylight.single
+ - service.gateway.opendaylight.single
- cluster.mcp-pike-odl-noha
parameters:
- _param:
- neutron_agents:
- - neutron-dhcp-agent
- - neutron-metadata-agent
- neutron:
- gateway:
- pkgs: ${_param:neutron_agents}
- services: ${_param:neutron_agents}
- backend:
- router: ${_param:opendaylight_router}
- opendaylight:
- client:
- ovsdb_server_iface: ptcp:6639:127.0.0.1
- ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
- tunnel_ip: ${_param:tenant_address}
- provider_mappings: physnet1:br-floating
linux:
network:
interface: