diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-05 20:47:05 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-05 21:53:52 +0400 |
| commit | 7d67464f9e33659de42ac4f1591f7a2cdc5bd178 (patch) | |
| tree | c7fa7d79e6603130fe9b8154ca425d6ec8af9f0f /mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack | |
| parent | 5e5e35e0cc0cf0abe1fd4a8d0cee8d6541a7f81b (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-ha/openstack')
3 files changed, 1 insertions, 21 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml index 3bc5af4ae..f763d94fc 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml @@ -10,22 +10,8 @@ classes: - cluster.mcp-pike-common-ha.openstack_compute - cluster.mcp-pike-odl-ha.openstack.compute_pdf - cluster.mcp-pike-odl-ha.infra - - system.neutron.gateway.opendaylight.single + - service.gateway.opendaylight.single parameters: - _param: - neutron_agents: - - neutron-dhcp-agent - - neutron-metadata-agent - 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 neutron: gateway: agent_mode: ${_param:neutron_gateway_agent_mode} - pkgs: ${_param:neutron_agents} - services: ${_param:neutron_agents} - backend: - router: ${_param:opendaylight_router} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml index ebfb2e1be..a6c8bc1df 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml @@ -11,8 +11,3 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.mcp-pike-common-ha.openstack_control - cluster.mcp-pike-odl-ha.infra -parameters: - neutron: - server: - backend: - router: ${_param:opendaylight_router} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml index af4d93013..a5e63b060 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml @@ -14,7 +14,6 @@ parameters: opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address} opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} opendaylight_server_node01_hostname: odl01 - opendaylight_router: odl-router_v2 neutron_tenant_network_types: "flat,vxlan" linux: |