From afae8d4d99d962448eb62cdd306f7a3dcda83744 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 4 Jun 2018 17:55:52 +0400 Subject: [noha] Update OpenStack version to Queens * make cluster names version-agnostic * pre-install oslo-templates formula * salt version update to 2017.7 * system reclass update Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869 Signed-off-by: Michael Polenchuk --- .../cluster/mcp-odl-noha/opendaylight/control.yml | 30 ++++++++++++++++++++++ .../mcp-odl-noha/opendaylight/control_pdf.yml.j2 | 25 ++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight') diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml new file mode 100644 index 000000000..0b513f065 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml @@ -0,0 +1,30 @@ +############################################################################## +# Copyright (c) 2018 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 + - service.opendaylight.server.single + - cluster.mcp-odl-noha + - cluster.mcp-odl-noha.opendaylight.control_pdf +parameters: + _param: + linux_system_codename: xenial + 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 + netvirt: + - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 new file mode 100644 index 000000000..fbb7de8b3 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 @@ -0,0 +1,25 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +{%- import 'net_map.j2' as nm with context %} +--- +parameters: + linux: + network: + interface: + dhcp_int: + enabled: true + name: {{ nm.ctl01.nic_admin }} + proto: dhcp + type: eth + single_int: + enabled: true + name: {{ nm.ctl01.nic_mgmt }} + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 -- cgit 1.2.3-korg