diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-noha')
4 files changed, 3 insertions, 28 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml index c192192af..8cd1c236b 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml @@ -9,7 +9,7 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.opendaylight.server.single + - service.opendaylight.server.single - cluster.mcp-pike-odl-noha - cluster.mcp-pike-odl-noha.opendaylight.control_pdf parameters: 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: |