From 8726a0d7ed8286d1aa86523a4acf61d9d4b4c9cd Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 20 Nov 2017 15:50:53 +0400 Subject: [virtual] Update openstack version to pike Change-Id: I1df0228cb44bf9122aaf93dd25fc16a0d26a5240 Signed-off-by: Michael Polenchuk --- .../cluster/virtual-mcp-pike-odl/infra/config.yml | 22 +++++++++ .../classes/cluster/virtual-mcp-pike-odl/init.yml | 20 ++++++++ .../virtual-mcp-pike-odl/opendaylight/control.yml | 41 ++++++++++++++++ .../virtual-mcp-pike-odl/openstack/compute.yml | 56 ++++++++++++++++++++++ .../virtual-mcp-pike-odl/openstack/control.yml | 42 ++++++++++++++++ .../virtual-mcp-pike-odl/openstack/gateway.yml | 41 ++++++++++++++++ .../virtual-mcp-pike-odl/openstack/init.yml | 22 +++++++++ 7 files changed, 244 insertions(+) create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-pike-odl') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml new file mode 100644 index 000000000..4fd8e75c8 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml @@ -0,0 +1,22 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - system.reclass.storage.system.opendaylight_control_single + - cluster.virtual-mcp-pike-common.infra.config + - cluster.virtual-mcp-pike-odl +parameters: + reclass: + storage: + node: + opendaylight_control_node01: + classes: + - cluster.${_param:cluster_name}.opendaylight.control + params: + linux_system_codename: xenial + single_address: ${_param:opendaylight_service_host} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml new file mode 100644 index 000000000..8501f032c --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml @@ -0,0 +1,20 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - system.linux.system.single + - cluster.all-mcp-arch-common + - cluster.virtual-mcp-pike-common.init_options + - cluster.virtual-mcp-pike-common.infra + - cluster.virtual-mcp-pike-odl.openstack + +parameters: + _param: + cluster_domain: virtual-mcp-pike-odl.local + cluster_name: virtual-mcp-pike-odl + opendaylight_service_host: 172.16.10.111 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml new file mode 100644 index 000000000..58b461ef9 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.opendaylight.server.single + - cluster.virtual-mcp-pike-odl +parameters: + _param: + linux_system_codename: xenial + linux: + network: + interface: + single_int: + enabled: true + name: ${_param:opnfv_fn_vm_secondary_interface} + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + opendaylight: + server: + odl_bind_ip: ${_param:single_address} + odl_rest_port: 8282 + java_min_mem: 3g + java_max_mem: 3g + router_enabled: true + karaf_features: + odl_default: + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + - odl-mdsal-apidocs + netvirt: + - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml new file mode 100644 index 000000000..34416f658 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.virtual-mcp-pike-common.openstack_compute + - cluster.virtual-mcp-pike-odl +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} + interface: + external_interface: + enabled: true + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-mesh: + enabled: true + type: bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + gateway: 10.1.0.110 + use_interfaces: + - ${_param:tenant_interface} + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml new file mode 100644 index 000000000..f904d64c3 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - system.neutron.control.opendaylight.single + - cluster.virtual-mcp-pike-common.openstack_control + - cluster.virtual-mcp-pike-odl +parameters: + neutron: + server: + backend: + router: ${_param:opendaylight_router} + haproxy: + proxy: + listen: + opendaylight-web: + type: general-service + service_name: opendaylight + binds: + - address: ${_param:cluster_vip_address} + port: 8181 + servers: + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8181 + params: ${_param:haproxy_check} + opendaylight-rest: + type: general-service + service_name: opendaylight + binds: + - address: ${_param:cluster_vip_address} + port: 8282 + servers: + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8282 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml new file mode 100644 index 000000000..00725e9b0 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.virtual-mcp-pike-common.openstack_gateway + - system.neutron.gateway.opendaylight.single + - cluster.virtual-mcp-pike-odl +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: + br-mesh: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml new file mode 100644 index 000000000..906d79a67 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml @@ -0,0 +1,22 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.virtual-mcp-pike-common.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vxlan" + opendaylight_router: odl-router_v2 + linux: + network: + host: + odl01: + address: 172.16.10.111 + names: + - odl01 + - odl01.${_param:cluster_domain} -- cgit 1.2.3-korg