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 --- mcp/reclass/classes/cluster/README.rst | 10 +- .../cluster/all-mcp-arch-common/aarch64/init.yml | 23 +++ .../classes/cluster/all-mcp-arch-common/init.yml | 11 ++ .../cluster/all-mcp-arch-common/opnfv/.gitignore | 2 + .../cluster/all-mcp-arch-common/opnfv/init.yml | 11 ++ .../all-mcp-arch-common/opnfv/pod_config.yml | 12 ++ .../opnfv/pod_config.yml.example | 103 +++++++++++ .../cluster/all-mcp-arch-common/opnfv/runtime.yml | 20 +++ .../all-mcp-arch-common/opnfv/runtime.yml.template | 20 +++ .../cluster/all-mcp-arch-common/x86_64/init.yml | 23 +++ .../cluster/all-mcp-ocata-common/aarch64/init.yml | 23 --- .../classes/cluster/all-mcp-ocata-common/init.yml | 11 -- .../cluster/all-mcp-ocata-common/opnfv/.gitignore | 2 - .../cluster/all-mcp-ocata-common/opnfv/init.yml | 11 -- .../all-mcp-ocata-common/opnfv/pod_config.yml | 12 -- .../opnfv/pod_config.yml.example | 103 ----------- .../cluster/all-mcp-ocata-common/opnfv/runtime.yml | 20 --- .../opnfv/runtime.yml.template | 20 --- .../cluster/all-mcp-ocata-common/x86_64/init.yml | 23 --- .../baremetal-mcp-ocata-common/infra/init.yml | 2 +- .../cluster/baremetal-mcp-ocata-odl-ha/init.yml | 2 +- .../baremetal-mcp-ocata-ovs-dpdk-ha/init.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-ha/init.yml | 2 +- .../haproxy_openstack_api.yml | 196 --------------------- .../virtual-mcp-ocata-common/infra/config.yml | 73 -------- .../virtual-mcp-ocata-common/infra/init.yml | 22 --- .../virtual-mcp-ocata-common/init_options.yml | 26 --- .../virtual-mcp-ocata-common/openstack_compute.yml | 102 ----------- .../virtual-mcp-ocata-common/openstack_control.yml | 148 ---------------- .../virtual-mcp-ocata-common/openstack_gateway.yml | 79 --------- .../virtual-mcp-ocata-common/openstack_init.yml | 129 -------------- .../virtual-mcp-ocata-odl-router/infra/config.yml | 22 --- .../cluster/virtual-mcp-ocata-odl-router/init.yml | 20 --- .../opendaylight/control.yml | 41 ----- .../openstack/compute.yml | 56 ------ .../openstack/control.yml | 42 ----- .../openstack/gateway.yml | 41 ----- .../openstack/init.yml | 29 --- .../virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 23 --- .../cluster/virtual-mcp-ocata-ovs-dpdk/init.yml | 19 -- .../openstack/compute.yml | 34 ---- .../openstack/control.yml | 17 -- .../openstack/gateway.yml | 26 --- .../virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 21 --- .../cluster/virtual-mcp-ocata-ovs/infra/config.yml | 11 -- .../classes/cluster/virtual-mcp-ocata-ovs/init.yml | 19 -- .../virtual-mcp-ocata-ovs/openstack/compute.yml | 23 --- .../virtual-mcp-ocata-ovs/openstack/control.yml | 12 -- .../virtual-mcp-ocata-ovs/openstack/gateway.yml | 25 --- .../virtual-mcp-ocata-ovs/openstack/init.yml | 13 -- .../haproxy_openstack_api.yml | 196 +++++++++++++++++++++ .../virtual-mcp-pike-common/infra/config.yml | 73 ++++++++ .../cluster/virtual-mcp-pike-common/infra/init.yml | 22 +++ .../virtual-mcp-pike-common/init_options.yml | 26 +++ .../virtual-mcp-pike-common/openstack_compute.yml | 96 ++++++++++ .../virtual-mcp-pike-common/openstack_control.yml | 145 +++++++++++++++ .../virtual-mcp-pike-common/openstack_gateway.yml | 78 ++++++++ .../virtual-mcp-pike-common/openstack_init.yml | 135 ++++++++++++++ .../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 +++ .../virtual-mcp-pike-ovs-dpdk/infra/config.yml | 23 +++ .../cluster/virtual-mcp-pike-ovs-dpdk/init.yml | 19 ++ .../openstack/compute.yml | 34 ++++ .../openstack/control.yml | 17 ++ .../openstack/gateway.yml | 26 +++ .../virtual-mcp-pike-ovs-dpdk/openstack/init.yml | 21 +++ .../cluster/virtual-mcp-pike-ovs/infra/config.yml | 11 ++ .../classes/cluster/virtual-mcp-pike-ovs/init.yml | 19 ++ .../virtual-mcp-pike-ovs/openstack/compute.yml | 23 +++ .../virtual-mcp-pike-ovs/openstack/control.yml | 12 ++ .../virtual-mcp-pike-ovs/openstack/gateway.yml | 25 +++ .../virtual-mcp-pike-ovs/openstack/init.yml | 13 ++ .../cfg01.virtual-mcp-ocata-odl-router.local.yml | 18 -- .../nodes/cfg01.virtual-mcp-ocata-odl.local.yml | 18 -- .../cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml | 18 -- .../nodes/cfg01.virtual-mcp-ocata-ovs.local.yml | 18 -- .../nodes/cfg01.virtual-mcp-pike-odl.local.yml | 18 ++ .../cfg01.virtual-mcp-pike-ovs-dpdk.local.yml | 18 ++ .../nodes/cfg01.virtual-mcp-pike-ovs.local.yml | 18 ++ 84 files changed, 1546 insertions(+), 1575 deletions(-) create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template create mode 100644 mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template delete mode 100644 mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml 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 create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml create mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml create mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml create mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml (limited to 'mcp/reclass') diff --git a/mcp/reclass/classes/cluster/README.rst b/mcp/reclass/classes/cluster/README.rst index 3fec9b0f2..6f7d06c30 100644 --- a/mcp/reclass/classes/cluster/README.rst +++ b/mcp/reclass/classes/cluster/README.rst @@ -10,14 +10,14 @@ Overview #. Common classes (baremetal + virtual) - - all-mcp-ocata-common + - all-mcp-arch-common #. Common classes (specific to either baremetal or virtual deploys) - - baremetal-mcp-ocata-common - - virtual-mcp-ocata-common + - baremetal-mcp--common + - virtual-mcp--common #. Cluster specific classes - - baremetal-mcp-ocata-* - - virtual-mcp-ocata-* + - baremetal-mcp--* + - virtual-mcp--* diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml new file mode 100644 index 000000000..0350afa3d --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml @@ -0,0 +1,23 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img + + # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) + opnfv_fn_vm_primary_interface: enp1s0 + opnfv_fn_vm_secondary_interface: enp2s0 + opnfv_fn_vm_tertiary_interface: enp3s0 + opnfv_fn_vm_quaternary_interface: enp4s0 + + # VCP VMs spawned on KVM Hosts net ifaces (max 3) + # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ + opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} + opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} + opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface} diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml new file mode 100644 index 000000000..f09ee5db1 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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.all-mcp-arch-common.arch + - cluster.all-mcp-arch-common.opnfv diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore new file mode 100644 index 000000000..bf6a84be7 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore @@ -0,0 +1,2 @@ +runtime.yml +pod_config.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml new file mode 100644 index 000000000..28dcdcd5b --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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.all-mcp-arch-common.opnfv.runtime + - cluster.all-mcp-arch-common.opnfv.pod_config diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml new file mode 100644 index 000000000..d72df2eb6 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + # NOTE: This file is overwritten at runtime by parsing the PDF. + opnfv_use_pod_descriptor_file: true diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example new file mode 100644 index 000000000..e5b852f32 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example @@ -0,0 +1,103 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + + opnfv_infra_config_address: 10.167.4.100 + opnfv_infra_maas_node01_address: 10.167.4.3 + opnfv_infra_maas_node01_deploy_address: 192.168.11.3 + opnfv_infra_compute_node01_address: 10.167.4.141 + opnfv_infra_compute_node02_address: 10.167.4.142 + opnfv_infra_compute_node03_address: 10.167.4.143 + opnfv_infra_kvm_address: 10.167.4.140 + opnfv_infra_kvm_node01_address: 10.167.4.141 + opnfv_infra_kvm_node02_address: 10.167.4.142 + opnfv_infra_kvm_node03_address: 10.167.4.143 + + opnfv_openstack_gateway_node01_address: 10.167.4.124 + opnfv_openstack_gateway_node02_address: 10.167.4.125 + opnfv_openstack_gateway_node03_address: 10.167.4.126 + opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 + opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 + opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 + opnfv_openstack_proxy_node01_control_address: 10.167.4.81 + opnfv_openstack_proxy_node02_control_address: 10.167.4.82 + opnfv_openstack_proxy_address: 172.30.10.103 + opnfv_openstack_proxy_node01_address: 172.30.10.104 + opnfv_openstack_proxy_node02_address: 172.30.10.105 + opnfv_openstack_control_address: 10.167.4.10 + opnfv_openstack_control_node01_address: 10.167.4.11 + opnfv_openstack_control_node02_address: 10.167.4.12 + opnfv_openstack_control_node03_address: 10.167.4.13 + opnfv_openstack_database_address: 10.167.4.50 + opnfv_openstack_database_node01_address: 10.167.4.51 + opnfv_openstack_database_node02_address: 10.167.4.52 + opnfv_openstack_database_node03_address: 10.167.4.53 + opnfv_openstack_message_queue_address: 10.167.4.40 + opnfv_openstack_message_queue_node01_address: 10.167.4.41 + opnfv_openstack_message_queue_node02_address: 10.167.4.42 + opnfv_openstack_message_queue_node03_address: 10.167.4.43 + opnfv_openstack_telemetry_address: 10.167.4.75 + opnfv_openstack_telemetry_node01_address: 10.167.4.76 + opnfv_openstack_telemetry_node02_address: 10.167.4.77 + opnfv_openstack_telemetry_node03_address: 10.167.4.78 + opnfv_openstack_compute_node01_single_address: 10.167.4.101 + opnfv_openstack_compute_node02_single_address: 10.167.4.102 + opnfv_openstack_compute_node03_single_address: 10.167.4.103 + opnfv_openstack_compute_node01_control_address: 10.167.4.101 + opnfv_openstack_compute_node02_control_address: 10.167.4.102 + opnfv_openstack_compute_node03_control_address: 10.167.4.103 + opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 + opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 + opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 + opnfv_openstack_compute_node01_external_address: 172.30.10.2 + opnfv_openstack_compute_node02_external_address: 172.30.10.3 + + opnfv_opendaylight_server_node01_single_address: 10.167.4.111 + + opnfv_net_public_gw: 172.30.10.1 + opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] + opnfv_dns_server01: '8.8.8.8' + opnfv_net_mgmt_vlan: 300 + opnfv_net_tenant_vlan: 1000 + + opnfv_maas_node01_architecture: 'amd64/generic' + opnfv_maas_node01_power_address: 172.30.8.75 + opnfv_maas_node01_power_type: ipmi + opnfv_maas_node01_power_user: admin + opnfv_maas_node01_power_password: octopus + opnfv_maas_node01_interface_mac: '00:25:b5:a0:00:2a' + + opnfv_maas_node02_architecture: 'amd64/generic' + opnfv_maas_node02_power_address: 172.30.8.65 + opnfv_maas_node02_power_type: ipmi + opnfv_maas_node02_power_user: admin + opnfv_maas_node02_power_password: octopus + opnfv_maas_node02_interface_mac: '00:25:b5:a0:00:3a' + + opnfv_maas_node03_architecture: 'amd64/generic' + opnfv_maas_node03_power_address: 172.30.8.74 + opnfv_maas_node03_power_type: ipmi + opnfv_maas_node03_power_user: admin + opnfv_maas_node03_power_password: octopus + opnfv_maas_node03_interface_mac: '00:25:b5:a0:00:4a' + + opnfv_maas_node04_architecture: 'amd64/generic' + opnfv_maas_node04_power_address: 172.30.8.73 + opnfv_maas_node04_power_type: ipmi + opnfv_maas_node04_power_user: admin + opnfv_maas_node04_power_password: octopus + opnfv_maas_node04_interface_mac: '00:25:b5:a0:00:5a' + + opnfv_maas_node05_architecture: 'amd64/generic' + opnfv_maas_node05_power_address: 172.30.8.72 + opnfv_maas_node05_power_type: ipmi + opnfv_maas_node05_power_user: admin + opnfv_maas_node05_power_password: octopus + opnfv_maas_node05_interface_mac: '00:25:b5:a0:00:6a' diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml new file mode 100644 index 000000000..4fd9e0368 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.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 +############################################################################## +--- +parameters: + _param: + reclass_config_master: 10.20.0.2 + opnfv_maas_mcp_address: 10.20.0.3 + opnfv_net_mcpcontrol: 10.20.0.0 + opnfv_net_mcpcontrol_mask: 255.255.255.0 + + # These should be moved to pod_config.yml and read based on PDF admin net + opnfv_maas_pxe_network_address: 192.168.11.0 + opnfv_maas_pxe_address: 192.168.11.3 + opnfv_maas_pxe_start_address: 192.168.11.5 + opnfv_maas_pxe_end_address: 192.168.11.250 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template new file mode 100644 index 000000000..1445917e6 --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template @@ -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 +############################################################################## +--- +parameters: + _param: + reclass_config_master: ${SALT_MASTER} + opnfv_maas_mcp_address: ${MAAS_IP} + opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0 + opnfv_net_mcpcontrol_mask: 255.255.255.0 + + # These should be moved to pod_config.yml and read based on PDF admin net + opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK} + opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK%.*}.3 + opnfv_maas_pxe_start_address: ${MAAS_PXE_NETWORK%.*}.5 + opnfv_maas_pxe_end_address: ${MAAS_PXE_NETWORK%.*}.250 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml new file mode 100644 index 000000000..a9a774bbb --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml @@ -0,0 +1,23 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + salt_control_xenial_image: http://images.mirantis.com.s3.amazonaws.com/ubuntu-16-04-x64-latest.qcow2 + + # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) + opnfv_fn_vm_primary_interface: ens3 + opnfv_fn_vm_secondary_interface: ens4 + opnfv_fn_vm_tertiary_interface: ens5 + opnfv_fn_vm_quaternary_interface: ens6 + + # VCP VMs spawned on KVM Hosts net ifaces (max 3) + # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ + opnfv_vcp_vm_primary_interface: ens2 + opnfv_vcp_vm_secondary_interface: ens3 + opnfv_vcp_vm_tertiary_interface: ens4 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml deleted file mode 100644 index 0350afa3d..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img - - # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) - opnfv_fn_vm_primary_interface: enp1s0 - opnfv_fn_vm_secondary_interface: enp2s0 - opnfv_fn_vm_tertiary_interface: enp3s0 - opnfv_fn_vm_quaternary_interface: enp4s0 - - # VCP VMs spawned on KVM Hosts net ifaces (max 3) - # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ - opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} - opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} - opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface} diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml deleted file mode 100644 index 3f57713fe..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# 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.all-mcp-ocata-common.arch - - cluster.all-mcp-ocata-common.opnfv diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore deleted file mode 100644 index bf6a84be7..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -runtime.yml -pod_config.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml deleted file mode 100644 index aa780e631..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# 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.all-mcp-ocata-common.opnfv.runtime - - cluster.all-mcp-ocata-common.opnfv.pod_config diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml deleted file mode 100644 index d72df2eb6..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - # NOTE: This file is overwritten at runtime by parsing the PDF. - opnfv_use_pod_descriptor_file: true diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example deleted file mode 100644 index e5b852f32..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example +++ /dev/null @@ -1,103 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - - opnfv_infra_config_address: 10.167.4.100 - opnfv_infra_maas_node01_address: 10.167.4.3 - opnfv_infra_maas_node01_deploy_address: 192.168.11.3 - opnfv_infra_compute_node01_address: 10.167.4.141 - opnfv_infra_compute_node02_address: 10.167.4.142 - opnfv_infra_compute_node03_address: 10.167.4.143 - opnfv_infra_kvm_address: 10.167.4.140 - opnfv_infra_kvm_node01_address: 10.167.4.141 - opnfv_infra_kvm_node02_address: 10.167.4.142 - opnfv_infra_kvm_node03_address: 10.167.4.143 - - opnfv_openstack_gateway_node01_address: 10.167.4.124 - opnfv_openstack_gateway_node02_address: 10.167.4.125 - opnfv_openstack_gateway_node03_address: 10.167.4.126 - opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 - opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 - opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 - opnfv_openstack_proxy_node01_control_address: 10.167.4.81 - opnfv_openstack_proxy_node02_control_address: 10.167.4.82 - opnfv_openstack_proxy_address: 172.30.10.103 - opnfv_openstack_proxy_node01_address: 172.30.10.104 - opnfv_openstack_proxy_node02_address: 172.30.10.105 - opnfv_openstack_control_address: 10.167.4.10 - opnfv_openstack_control_node01_address: 10.167.4.11 - opnfv_openstack_control_node02_address: 10.167.4.12 - opnfv_openstack_control_node03_address: 10.167.4.13 - opnfv_openstack_database_address: 10.167.4.50 - opnfv_openstack_database_node01_address: 10.167.4.51 - opnfv_openstack_database_node02_address: 10.167.4.52 - opnfv_openstack_database_node03_address: 10.167.4.53 - opnfv_openstack_message_queue_address: 10.167.4.40 - opnfv_openstack_message_queue_node01_address: 10.167.4.41 - opnfv_openstack_message_queue_node02_address: 10.167.4.42 - opnfv_openstack_message_queue_node03_address: 10.167.4.43 - opnfv_openstack_telemetry_address: 10.167.4.75 - opnfv_openstack_telemetry_node01_address: 10.167.4.76 - opnfv_openstack_telemetry_node02_address: 10.167.4.77 - opnfv_openstack_telemetry_node03_address: 10.167.4.78 - opnfv_openstack_compute_node01_single_address: 10.167.4.101 - opnfv_openstack_compute_node02_single_address: 10.167.4.102 - opnfv_openstack_compute_node03_single_address: 10.167.4.103 - opnfv_openstack_compute_node01_control_address: 10.167.4.101 - opnfv_openstack_compute_node02_control_address: 10.167.4.102 - opnfv_openstack_compute_node03_control_address: 10.167.4.103 - opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 - opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 - opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 - opnfv_openstack_compute_node01_external_address: 172.30.10.2 - opnfv_openstack_compute_node02_external_address: 172.30.10.3 - - opnfv_opendaylight_server_node01_single_address: 10.167.4.111 - - opnfv_net_public_gw: 172.30.10.1 - opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] - opnfv_dns_server01: '8.8.8.8' - opnfv_net_mgmt_vlan: 300 - opnfv_net_tenant_vlan: 1000 - - opnfv_maas_node01_architecture: 'amd64/generic' - opnfv_maas_node01_power_address: 172.30.8.75 - opnfv_maas_node01_power_type: ipmi - opnfv_maas_node01_power_user: admin - opnfv_maas_node01_power_password: octopus - opnfv_maas_node01_interface_mac: '00:25:b5:a0:00:2a' - - opnfv_maas_node02_architecture: 'amd64/generic' - opnfv_maas_node02_power_address: 172.30.8.65 - opnfv_maas_node02_power_type: ipmi - opnfv_maas_node02_power_user: admin - opnfv_maas_node02_power_password: octopus - opnfv_maas_node02_interface_mac: '00:25:b5:a0:00:3a' - - opnfv_maas_node03_architecture: 'amd64/generic' - opnfv_maas_node03_power_address: 172.30.8.74 - opnfv_maas_node03_power_type: ipmi - opnfv_maas_node03_power_user: admin - opnfv_maas_node03_power_password: octopus - opnfv_maas_node03_interface_mac: '00:25:b5:a0:00:4a' - - opnfv_maas_node04_architecture: 'amd64/generic' - opnfv_maas_node04_power_address: 172.30.8.73 - opnfv_maas_node04_power_type: ipmi - opnfv_maas_node04_power_user: admin - opnfv_maas_node04_power_password: octopus - opnfv_maas_node04_interface_mac: '00:25:b5:a0:00:5a' - - opnfv_maas_node05_architecture: 'amd64/generic' - opnfv_maas_node05_power_address: 172.30.8.72 - opnfv_maas_node05_power_type: ipmi - opnfv_maas_node05_power_user: admin - opnfv_maas_node05_power_password: octopus - opnfv_maas_node05_interface_mac: '00:25:b5:a0:00:6a' diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml deleted file mode 100644 index 4fd9e0368..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - reclass_config_master: 10.20.0.2 - opnfv_maas_mcp_address: 10.20.0.3 - opnfv_net_mcpcontrol: 10.20.0.0 - opnfv_net_mcpcontrol_mask: 255.255.255.0 - - # These should be moved to pod_config.yml and read based on PDF admin net - opnfv_maas_pxe_network_address: 192.168.11.0 - opnfv_maas_pxe_address: 192.168.11.3 - opnfv_maas_pxe_start_address: 192.168.11.5 - opnfv_maas_pxe_end_address: 192.168.11.250 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template deleted file mode 100644 index 1445917e6..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - reclass_config_master: ${SALT_MASTER} - opnfv_maas_mcp_address: ${MAAS_IP} - opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0 - opnfv_net_mcpcontrol_mask: 255.255.255.0 - - # These should be moved to pod_config.yml and read based on PDF admin net - opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK} - opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK%.*}.3 - opnfv_maas_pxe_start_address: ${MAAS_PXE_NETWORK%.*}.5 - opnfv_maas_pxe_end_address: ${MAAS_PXE_NETWORK%.*}.250 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml deleted file mode 100644 index a9a774bbb..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - salt_control_xenial_image: http://images.mirantis.com.s3.amazonaws.com/ubuntu-16-04-x64-latest.qcow2 - - # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) - opnfv_fn_vm_primary_interface: ens3 - opnfv_fn_vm_secondary_interface: ens4 - opnfv_fn_vm_tertiary_interface: ens5 - opnfv_fn_vm_quaternary_interface: ens6 - - # VCP VMs spawned on KVM Hosts net ifaces (max 3) - # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ - opnfv_vcp_vm_primary_interface: ens2 - opnfv_vcp_vm_secondary_interface: ens3 - opnfv_vcp_vm_tertiary_interface: ens4 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml index 3d3f8df62..55160bd6b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml @@ -8,7 +8,7 @@ --- classes: - system.linux.system.single - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common # - cluster.baremetal-mcp-ocata-common.stacklight # - cluster.baremetal-mcp-ocata-common.stacklight.client parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml index bd8e46907..474ee6d70 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml index cd8eebae5..5f05c05b8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml index b15c8c3a8..1c2952456 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common - cluster.baremetal-mcp-ocata-ovs-ha.infra - cluster.baremetal-mcp-ocata-ovs-ha.openstack diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml deleted file mode 100644 index 649b75c8c..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml +++ /dev/null @@ -1,196 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 - haproxy: - proxy: - listen: - cinder_api: - type: openstack-service - service_name: cinder - binds: - - address: ${_param:cluster_vip_address} - port: 8776 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: ${_param:haproxy_check} - glance_api: - type: openstack-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9292 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: ${_param:haproxy_check} - glance_registry_api: - type: general-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9191 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: ${_param:haproxy_check} - glare: - type: general-service - service_name: glare - binds: - - address: ${_param:cluster_vip_address} - port: 9494 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: ${_param:haproxy_check} - heat_cloudwatch_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8003 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} - heat_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8004 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: ${_param:haproxy_check} - heat_cfn_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: ${_param:haproxy_check} - keystone_public_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 5000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: ${_param:haproxy_check} - keystone_admin_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 35357 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: ${_param:haproxy_check} - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: ${_param:haproxy_check} - nova_placement_api: - mode: http - binds: - - address: ${_param:cluster_vip_address} - port: 8778 - options: - - httpclose - - httplog - health-check: - http: - options: - - expect status 401 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: ${_param:haproxy_check} - nova_ec2_api: - type: general-service - service_name: nova - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8773 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: ${_param:haproxy_check} - nova_api: - type: openstack-service - service_name: nova - binds: - - address: ${_param:cluster_vip_address} - port: 8774 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: ${_param:haproxy_check} - nova_metadata_api: - type: openstack-service - binds: - - address: ${_param:cluster_vip_address} - port: 8775 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: ${_param:haproxy_check} - ceilometer_api: - type: general-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8777 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8777 - params: ${_param:haproxy_check} - aodh-api: - type: openstack-service - service_name: aodh - binds: - - address: ${_param:cluster_vip_address} - port: 8042 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8042 - params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml deleted file mode 100644 index 3c3d5260a..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ /dev/null @@ -1,73 +0,0 @@ -############################################################################## -# 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: - - service.git.client - - system.linux.system.single - - system.linux.system.repo.mcp.salt - - system.salt.master.api - - system.salt.master.pkg - - system.reclass.storage.salt - - system.salt.minion.ca.salt_master - - system.salt.minion.cert.proxy - - system.mysql.client.single - - system.reclass.storage.system.openstack_compute_multi - - system.reclass.storage.system.openstack_gateway_single -parameters: - _param: - openstack_control_node01_hostname: ctl01 - reclass_data_repository: local - salt_master_environment_repository: "https://github.com/tcpcloud" - salt_master_environment_revision: master - single_address: 172.16.10.100 - salt_master_host: 127.0.0.1 - salt_master_base_environment: prd - salt_minion_ca_host: ${linux:network:fqdn} - # yamllint disable-line rule:line-length - salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" - 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 - salt: - master: - file_recv: true - reclass: - storage: - data_source: - engine: local - node: - openstack_control_node01: - name: ${_param:openstack_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.control - params: - linux_system_codename: xenial - salt_master_host: ${_param:reclass_config_master} - single_address: ${_param:openstack_control_node01_address} - openstack_compute_node01: - params: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 - external_address: 10.16.0.105 - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 - external_address: 10.16.0.106 - openstack_gateway_node01: - params: - tenant_address: 10.1.0.110 - external_address: 10.16.0.110 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml deleted file mode 100644 index 2385411b4..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - linux: - network: - host: - cfg01: - address: ${_param:infra_config_address} - names: - - cfg01 - - cfg01.${_param:cluster_domain} - cfg: - address: ${_param:infra_config_address} - names: - - cfg - - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml deleted file mode 100644 index 9540b9436..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - openstack_control_node01_address: 172.16.10.101 - openstack_control_node02_address: 172.16.10.102 - openstack_control_node03_address: 172.16.10.103 - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: 172.16.10.110 - control_address: ${_param:openstack_control_address} - ntp_strata_host1: 1.se.pool.ntp.org - ntp_strata_host2: 0.se.pool.ntp.org diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml deleted file mode 100644 index ad0675475..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ /dev/null @@ -1,102 +0,0 @@ -############################################################################## -# 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.storage.loopback - - service.nfs.client - - system.nova.compute.single - - service.neutron.compute.single - - service.cinder.volume.single - - system.cinder.volume.backend.lvm - - system.ceilometer.agent.cluster - - system.ceilometer.client.nova_compute - - system.ceilometer.client.cinder_volume -parameters: - _param: - primary_interface: ${_param:opnfv_fn_vm_secondary_interface} - tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface} - external_interface: ${_param:opnfv_fn_vm_quaternary_interface} - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 20 - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd - vncproxy_url: http://${_param:cluster_vip_address}:6080 - network: - region: ${_param:openstack_region} - user: neutron - tenant: service - password: ${_param:keystone_neutron_password} - neutron: - compute: - notification: true - vlan_aware_vms: true - agent_mode: ${_param:neutron_compute_agent_mode} - message_queue: - host: ${_param:openstack_control_address} - metadata: - host: ${_param:openstack_control_address} - cinder: - volume: - database: - host: ${_param:cluster_local_address} - identity: - host: ${_param:cluster_local_address} - glance: - host: ${_param:cluster_local_address} - message_queue: - host: ${_param:cluster_local_address} - nfs: - client: - mount: - nfs: - path: /var/lib/nova/instances - fstype: nfs - device: ${_param:openstack_control_address}:/srv/nova/instances - linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: - sysctl: - vm.dirty_ratio: 10 - vm.dirty_background_ratio: 5 - network: - bridge: openvswitch - interface: - dhcp_int: - enabled: true - name: ${_param:opnfv_fn_vm_primary_interface} - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml deleted file mode 100644 index ab5833910..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ /dev/null @@ -1,148 +0,0 @@ -############################################################################## -# 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.lowmem - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - - service.nfs.server - - system.mongodb.server.single - - system.mongodb.server.database.ceilometer - - system.ceilometer.client - - system.ceilometer.client.neutron - - system.memcached.server.single - - system.rabbitmq.server.single - - system.rabbitmq.server.vhost.openstack - - system.keystone.server.wsgi - - system.keystone.server.single - - system.keystone.client.single - - system.keystone.client.service.nova21 - - system.keystone.client.service.nova-placement - - system.keystone.client.service.glare - - system.keystone.client.service.cinder3 - - system.keystone.client.service.ceilometer - - system.keystone.client.service.aodh - - system.glance.control.single - - system.nova.control.single - - system.cinder.control.single - - system.cinder.control.backend.lvm - - system.heat.server.single - - service.mysql.server.single - - system.galera.server.database.cinder - - system.galera.server.database.glance - - system.galera.server.database.grafana - - system.galera.server.database.heat - - system.galera.server.database.keystone - - system.galera.server.database.nova - - system.galera.server.database.ceilometer - - system.galera.server.database.aodh - - service.ceilometer.server.single - - system.aodh.server.single - - system.horizon.server.single - - service.haproxy.proxy.single - - cluster.virtual-mcp-ocata-common.haproxy_openstack_api -parameters: - _param: - linux_system_codename: xenial - linux: - system: - package: - python-msgpack: - version: latest - 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 - public_int: - enabled: true - name: ${_param:opnfv_fn_vm_quaternary_interface} - type: eth - proto: static - address: ${_param:cluster_public_host} - netmask: 255.255.255.0 - keystone: - server: - admin_email: ${_param:admin_email} - pkgs: - - keystone - - python-keystone - - python-keystoneclient - - python-psycopg2 - - python-mysqldb - - python-six - - python-memcache - - python-openstackclient - - gettext-base - - python-pycadf - glance: - server: - storage: - engine: file - images: [] - workers: 1 - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 - horizon: - server: - # yamllint disable-line rule:truthy - secure: False - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - mysql: - server: - version: '5.7' - bind: - address: ${_param:cluster_local_address} - key_buffer: 8 - max_allowed_packet: 128 - max_connections: 2048 - thread_stack: 512 - thread_cache_size: 12 - query_cache_limit: 2 - query_cache_size: 0 - mongodb: - server: - bind: - address: ${_param:cluster_local_address},127.0.0.1 - logging: - verbose: v - nfs: - server: - share: - nova_instances: - path: /srv/nova/instances - host: - nova: - host: ${_param:single_address}/24 - params: - - rw - - no_root_squash - - async - neutron: - server: - vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml deleted file mode 100644 index 4ed8eed77..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################## -# 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 -parameters: - _param: - primary_interface: ${_param:opnfv_fn_vm_secondary_interface} - tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface} - external_interface: ${_param:opnfv_fn_vm_quaternary_interface} - interface_mtu: 9000 - linux_system_codename: xenial - neutron: - gateway: - notification: true - agent_mode: ${_param:neutron_gateway_agent_mode} - vlan_aware_vms: true - linux: - network: - bridge: openvswitch - interface: - dhcp_int: - enabled: true - name: ${_param:opnfv_fn_vm_primary_interface} - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - mtu: ${_param:interface_mtu} - use_interfaces: - - ${_param:primary_interface} - 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-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml deleted file mode 100644 index 81f050f89..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml +++ /dev/null @@ -1,129 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -parameters: - _param: - openstack_version: ocata - apt_mk_version: nightly - mcp_repo_version: 1.1 - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http - cluster_public_host: 10.16.0.101 - neutron_public_protocol: http - neutron_control_dvr: 'False' - neutron_l3_ha: 'False' - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_gateway_dvr: 'False' - neutron_gateway_agent_mode: legacy - neutron_compute_dvr: 'False' - neutron_compute_agent_mode: legacy - neutron_compute_external_access: 'False' - galera_server_cluster_name: openstack_cluster - galera_server_maintenance_password: opnfv_secret - galera_server_admin_password: opnfv_secret - cluster_vip_address: ${_param:cluster_public_host} - cluster_local_address: ${_param:openstack_control_address} - cluster_node01_hostname: ctl01 - cluster_node01_address: 172.16.10.101 - cluster_node02_hostname: ctl02 - cluster_node02_address: 172.16.10.102 - cluster_node03_hostname: ctl03 - cluster_node03_address: 172.16.10.103 - rabbitmq_secret_key: opnfv_secret - rabbitmq_admin_password: opnfv_secret - rabbitmq_openstack_password: opnfv_secret - rabbitmq_cold_password: opnfv_secret - glance_version: ${_param:openstack_version} - glance_service_host: ${_param:cluster_local_address} - keystone_version: ${_param:openstack_version} - keystone_service_host: ${_param:cluster_local_address} - heat_version: ${_param:openstack_version} - heat_service_host: ${_param:cluster_local_address} - heat_domain_admin_password: opnfv_secret - ceilometer_version: ${_param:openstack_version} - ceilometer_service_host: ${_param:cluster_local_address} - ceilometer_database_host: ${_param:cluster_local_address} - cinder_version: ${_param:openstack_version} - cinder_service_host: ${_param:cluster_local_address} - ceilometer_graphite_publisher_host: 172.16.10.107 - ceilometer_graphite_publisher_port: 2013 - nova_version: ${_param:openstack_version} - nova_service_host: ${_param:cluster_local_address} - nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 - neutron_version: ${_param:openstack_version} - neutron_service_host: ${_param:cluster_local_address} - mysql_admin_user: root - mysql_admin_password: opnfv_secret - mysql_cinder_password: opnfv_secret - mysql_ceilometer_password: opnfv_secret - mysql_glance_password: opnfv_secret - mysql_grafana_password: opnfv_secret - mysql_heat_password: opnfv_secret - mysql_keystone_password: opnfv_secret - mysql_neutron_password: opnfv_secret - mysql_nova_password: opnfv_secret - mysql_aodh_password: opnfv_secret - keystone_service_token: opnfv_secret - keystone_admin_password: opnfv_secret - keystone_ceilometer_password: opnfv_secret - keystone_cinder_password: opnfv_secret - keystone_glance_password: opnfv_secret - keystone_heat_password: opnfv_secret - keystone_keystone_password: opnfv_secret - keystone_neutron_password: opnfv_secret - keystone_nova_password: opnfv_secret - ceilometer_secret_key: opnfv_secret - metadata_password: opnfv_secret - horizon_version: ${_param:openstack_version} - horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e - horizon_identity_host: ${_param:cluster_vip_address} - horizon_identity_encryption: none - horizon_identity_version: 2 - mongodb_server_replica_set: ceilometer - mongodb_ceilometer_password: opnfv_secret - mongodb_admin_password: opnfv_secret - mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth - aodh_version: ${_param:openstack_version} - keystone_aodh_password: opnfv_secret - aodh_service_host: ${_param:cluster_local_address} - linux: - system: - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 - network: - host: - ctl: - address: ${_param:openstack_control_address} - names: - - ctl - - ctl.${_param:cluster_domain} - ctl01: - address: ${_param:openstack_control_node01_address} - names: - - ctl01 - - ctl01.${_param:cluster_domain} - gtw01: - address: ${_param:openstack_gateway_address} - names: - - gtw01 - - gtw01.${_param:cluster_domain} - cmp01: - address: 172.16.10.105 - names: - - cmp01 - - cmp01.${_param:cluster_domain} - cmp02: - address: 172.16.10.106 - names: - - cmp02 - - cmp02.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml deleted file mode 100644 index 24c302869..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################## -# 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-ocata-common.infra.config - - cluster.virtual-mcp-ocata-odl-router -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-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml deleted file mode 100644 index 980ea1b0b..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# 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-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-odl-router.openstack - -parameters: - _param: - cluster_domain: virtual-mcp-ocata-odl-router.local - cluster_name: virtual-mcp-ocata-odl-router - opendaylight_service_host: 172.16.10.111 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml deleted file mode 100644 index f75cd3300..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# 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-ocata-odl-router -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-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml deleted file mode 100644 index f6f26be67..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-odl-router -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-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml deleted file mode 100644 index a0ace9601..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-odl-router -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-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml deleted file mode 100644 index 231413a19..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_gateway - - system.neutron.gateway.opendaylight.single - - cluster.virtual-mcp-ocata-odl-router -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-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml deleted file mode 100644 index 5be63e51b..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" - opendaylight_router: odl-router_v2 - linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - network: - host: - odl01: - address: 172.16.10.111 - names: - - odl01 - - odl01.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml deleted file mode 100644 index ef0735743..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# 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-ocata-common.infra.config - - cluster.virtual-mcp-ocata-ovs-dpdk -parameters: - reclass: - storage: - node: - openstack_compute_node01: - params: - dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} - dpdk0_pci: '"0000:00:05.0"' - openstack_compute_node02: - params: - dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} - dpdk0_pci: '"0000:00:05.0"' diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml deleted file mode 100644 index 588e8bee0..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# 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-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-ovs-dpdk.openstack - -parameters: - _param: - cluster_domain: virtual-mcp-ocata-ovs-dpdk.local - cluster_name: virtual-mcp-ocata-ovs-dpdk diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml deleted file mode 100644 index ba6577e0d..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################## -# 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.nova.compute.nfv.hugepages - - system.neutron.compute.nfv.dpdk - - cluster.virtual-mcp-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-ovs-dpdk -parameters: - neutron: - compute: - backend: - tenant_network_types: ${_param:neutron_tenant_network_types} - linux: - network: - interface: - dpdk0: - name: ${_param:dpdk0_name} - pci: ${_param:dpdk0_pci} - driver: igb_uio - enabled: true - bridge: br-prv - type: dpdk_ovs_port - n_rxq: 2 - br-prv: - enabled: true - type: dpdk_ovs_bridge diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml deleted file mode 100644 index 780f66427..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# 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.openvswitch.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-ovs-dpdk -parameters: - neutron: - server: - backend: - tenant_vlan_range: 1000:1999 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml deleted file mode 100644 index 4f215e807..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_gateway - - service.neutron.gateway.single - - cluster.virtual-mcp-ocata-ovs-dpdk -parameters: - neutron: - gateway: - backend: - tenant_network_types: ${_param:neutron_tenant_network_types} - linux: - network: - interface: - tenant_interface: - ovs_bridge: br-prv - br-prv: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml deleted file mode 100644 index c27f73b05..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vlan" - compute_hugepages_size: 2M - compute_hugepages_count: 2048 - compute_hugepages_mount: /mnt/hugepages_2M - compute_dpdk_driver: uio - compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" - compute_ovs_dpdk_lcore_mask: "0x8" - compute_ovs_memory_channels: "2" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml deleted file mode 100644 index 8505e3503..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# 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-ocata-common.infra.config - - cluster.virtual-mcp-ocata-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml deleted file mode 100644 index 56e676ba9..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# 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-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-ovs.openstack - -parameters: - _param: - cluster_domain: virtual-mcp-ocata-ovs.local - cluster_name: virtual-mcp-ocata-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml deleted file mode 100644 index c9fee8842..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-ovs -parameters: - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - 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-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml deleted file mode 100644 index 17250c338..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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.openvswitch.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml deleted file mode 100644 index 50c0f6e4d..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_gateway - - service.neutron.gateway.single - - cluster.virtual-mcp-ocata-ovs -parameters: - 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-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml deleted file mode 100644 index 4b083944a..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# 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-ocata-common.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml new file mode 100644 index 000000000..649b75c8c --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml @@ -0,0 +1,196 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 + haproxy: + proxy: + listen: + cinder_api: + type: openstack-service + service_name: cinder + binds: + - address: ${_param:cluster_vip_address} + port: 8776 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8776 + params: ${_param:haproxy_check} + glance_api: + type: openstack-service + service_name: glance + binds: + - address: ${_param:cluster_vip_address} + port: 9292 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9292 + params: ${_param:haproxy_check} + glance_registry_api: + type: general-service + service_name: glance + binds: + - address: ${_param:cluster_vip_address} + port: 9191 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9191 + params: ${_param:haproxy_check} + glare: + type: general-service + service_name: glare + binds: + - address: ${_param:cluster_vip_address} + port: 9494 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9494 + params: ${_param:haproxy_check} + heat_cloudwatch_api: + type: openstack-service + service_name: heat + binds: + - address: ${_param:cluster_vip_address} + port: 8003 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8003 + params: ${_param:haproxy_check} + heat_api: + type: openstack-service + service_name: heat + binds: + - address: ${_param:cluster_vip_address} + port: 8004 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8004 + params: ${_param:haproxy_check} + heat_cfn_api: + type: openstack-service + service_name: heat + binds: + - address: ${_param:cluster_vip_address} + port: 8000 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8000 + params: ${_param:haproxy_check} + keystone_public_api: + type: openstack-service + service_name: keystone + binds: + - address: ${_param:cluster_vip_address} + port: 5000 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 5000 + params: ${_param:haproxy_check} + keystone_admin_api: + type: openstack-service + service_name: keystone + binds: + - address: ${_param:cluster_vip_address} + port: 35357 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 35357 + params: ${_param:haproxy_check} + neutron_api: + type: openstack-service + service_name: neutron + binds: + - address: ${_param:cluster_vip_address} + port: 9696 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9696 + params: ${_param:haproxy_check} + nova_placement_api: + mode: http + binds: + - address: ${_param:cluster_vip_address} + port: 8778 + options: + - httpclose + - httplog + health-check: + http: + options: + - expect status 401 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8778 + params: ${_param:haproxy_check} + nova_ec2_api: + type: general-service + service_name: nova + check: false + binds: + - address: ${_param:cluster_vip_address} + port: 8773 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8773 + params: ${_param:haproxy_check} + nova_api: + type: openstack-service + service_name: nova + binds: + - address: ${_param:cluster_vip_address} + port: 8774 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8774 + params: ${_param:haproxy_check} + nova_metadata_api: + type: openstack-service + binds: + - address: ${_param:cluster_vip_address} + port: 8775 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8775 + params: ${_param:haproxy_check} + ceilometer_api: + type: general-service + check: false + binds: + - address: ${_param:cluster_vip_address} + port: 8777 + servers: + - name: ${_param:cluster_node01_hostname} + host: ${_param:cluster_node01_address} + port: 8777 + params: ${_param:haproxy_check} + aodh-api: + type: openstack-service + service_name: aodh + binds: + - address: ${_param:cluster_vip_address} + port: 8042 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8042 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml new file mode 100644 index 000000000..3c3d5260a --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml @@ -0,0 +1,73 @@ +############################################################################## +# 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: + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.salt.master.api + - system.salt.master.pkg + - system.reclass.storage.salt + - system.salt.minion.ca.salt_master + - system.salt.minion.cert.proxy + - system.mysql.client.single + - system.reclass.storage.system.openstack_compute_multi + - system.reclass.storage.system.openstack_gateway_single +parameters: + _param: + openstack_control_node01_hostname: ctl01 + reclass_data_repository: local + salt_master_environment_repository: "https://github.com/tcpcloud" + salt_master_environment_revision: master + single_address: 172.16.10.100 + salt_master_host: 127.0.0.1 + salt_master_base_environment: prd + salt_minion_ca_host: ${linux:network:fqdn} + # yamllint disable-line rule:line-length + salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" + 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 + salt: + master: + file_recv: true + reclass: + storage: + data_source: + engine: local + node: + openstack_control_node01: + name: ${_param:openstack_control_node01_hostname} + domain: ${_param:cluster_domain} + classes: + - cluster.${_param:cluster_name}.openstack.control + params: + linux_system_codename: xenial + salt_master_host: ${_param:reclass_config_master} + single_address: ${_param:openstack_control_node01_address} + openstack_compute_node01: + params: + single_address: 172.16.10.105 + tenant_address: 10.1.0.105 + external_address: 10.16.0.105 + openstack_compute_node02: + params: + single_address: 172.16.10.106 + tenant_address: 10.1.0.106 + external_address: 10.16.0.106 + openstack_gateway_node01: + params: + tenant_address: 10.1.0.110 + external_address: 10.16.0.110 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml new file mode 100644 index 000000000..2385411b4 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/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 +############################################################################## +--- +parameters: + linux: + network: + host: + cfg01: + address: ${_param:infra_config_address} + names: + - cfg01 + - cfg01.${_param:cluster_domain} + cfg: + address: ${_param:infra_config_address} + names: + - cfg + - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml new file mode 100644 index 000000000..9540b9436 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml @@ -0,0 +1,26 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + # infra service addresses + infra_config_address: 172.16.10.100 + # openstack service addresses + openstack_control_address: 172.16.10.101 + openstack_control_node01_address: 172.16.10.101 + openstack_control_node02_address: 172.16.10.102 + openstack_control_node03_address: 172.16.10.103 + openstack_database_address: ${_param:openstack_control_address} + openstack_message_queue_address: ${_param:openstack_control_address} + openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} + openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} + openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} + openstack_gateway_address: 172.16.10.110 + control_address: ${_param:openstack_control_address} + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml new file mode 100644 index 000000000..35c23fef7 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml @@ -0,0 +1,96 @@ +############################################################################## +# 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.storage.loopback + - service.nfs.client + - system.nova.compute.single + - service.neutron.compute.single + - service.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - system.ceilometer.client.nova_compute + - system.ceilometer.client.cinder_volume +parameters: + _param: + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface} + external_interface: ${_param:opnfv_fn_vm_quaternary_interface} + interface_mtu: 9000 + linux_system_codename: xenial + loopback_device_size: 20 + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd + vncproxy_url: http://${_param:cluster_vip_address}:6080 + network: + region: ${_param:openstack_region} + user: neutron + tenant: service + password: ${_param:keystone_neutron_password} + neutron: + compute: + notification: true + vlan_aware_vms: true + agent_mode: ${_param:neutron_compute_agent_mode} + message_queue: + host: ${_param:openstack_control_address} + metadata: + host: ${_param:openstack_control_address} + cinder: + volume: + database: + host: ${_param:cluster_local_address} + identity: + host: ${_param:cluster_local_address} + glance: + host: ${_param:cluster_local_address} + message_queue: + host: ${_param:cluster_local_address} + nfs: + client: + mount: + nfs: + path: /var/lib/nova/instances + fstype: nfs + device: ${_param:openstack_control_address}:/srv/nova/instances + linux: + system: + kernel: + sysctl: + vm.dirty_ratio: 10 + vm.dirty_background_ratio: 5 + network: + bridge: openvswitch + interface: + dhcp_int: + enabled: true + name: ${_param:opnfv_fn_vm_primary_interface} + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} + primary_interface: + enabled: true + name: ${_param:primary_interface} + proto: manual + type: eth + tenant_interface: + enabled: true + name: ${_param:tenant_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-mgmt: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml new file mode 100644 index 000000000..458765020 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml @@ -0,0 +1,145 @@ +############################################################################## +# 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.lowmem + - system.linux.system.repo.mcp.extra + - service.nfs.server + - system.mongodb.server.single + - system.mongodb.server.database.ceilometer + - system.ceilometer.client + - system.ceilometer.client.neutron + - system.memcached.server.single + - system.rabbitmq.server.single + - system.rabbitmq.server.vhost.openstack + - system.keystone.server.wsgi + - system.keystone.server.single + - system.keystone.client.single + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.ceilometer + - system.keystone.client.service.aodh + - system.glance.control.single + - system.nova.control.single + - system.cinder.control.single + - system.cinder.control.backend.lvm + - system.heat.server.single + - service.mysql.server.single + - system.galera.server.database.cinder + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.ceilometer + - system.galera.server.database.aodh + - service.ceilometer.server.single + - system.aodh.server.single + - system.horizon.server.single + - service.haproxy.proxy.single + - cluster.virtual-mcp-pike-common.haproxy_openstack_api +parameters: + _param: + linux_system_codename: xenial + linux: + system: + package: + python-msgpack: + version: latest + 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 + public_int: + enabled: true + name: ${_param:opnfv_fn_vm_quaternary_interface} + type: eth + proto: static + address: ${_param:cluster_public_host} + netmask: 255.255.255.0 + keystone: + server: + admin_email: ${_param:admin_email} + glance: + server: + storage: + engine: file + images: [] + workers: 1 + nova: + controller: + networking: dvr + cpu_allocation: 54 + metadata: + password: ${_param:metadata_password} + bind: + private_address: ${_param:cluster_local_address} + public_address: ${_param:cluster_vip_address} + novncproxy_port: 6080 + vncproxy_url: http://${_param:cluster_vip_address}:6080 + workers: 1 + pkgs: + - nova-common + - nova-novncproxy + - novnc + - nova-api + - nova-conductor + - nova-consoleauth + - nova-scheduler + - python-novaclient + horizon: + server: + # yamllint disable-line rule:truthy + secure: False + heat: + server: + bind: + api_cfn: + address: ${_param:single_address} + api_cloudwatch: + address: ${_param:single_address} + mysql: + server: + version: '5.7' + bind: + address: ${_param:cluster_local_address} + key_buffer: 8 + max_allowed_packet: 128 + max_connections: 2048 + thread_stack: 512 + thread_cache_size: 12 + query_cache_limit: 2 + query_cache_size: 0 + mongodb: + server: + bind: + address: ${_param:cluster_local_address},127.0.0.1 + logging: + verbose: v + nfs: + server: + share: + nova_instances: + path: /srv/nova/instances + host: + nova: + host: ${_param:single_address}/24 + params: + - rw + - no_root_squash + - async + neutron: + server: + vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml new file mode 100644 index 000000000..7d5313444 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml @@ -0,0 +1,78 @@ +############################################################################## +# 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.extra +parameters: + _param: + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface} + external_interface: ${_param:opnfv_fn_vm_quaternary_interface} + interface_mtu: 9000 + linux_system_codename: xenial + neutron: + gateway: + notification: true + agent_mode: ${_param:neutron_gateway_agent_mode} + vlan_aware_vms: true + linux: + network: + bridge: openvswitch + interface: + dhcp_int: + enabled: true + name: ${_param:opnfv_fn_vm_primary_interface} + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} + primary_interface: + enabled: true + name: ${_param:primary_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + tenant_interface: + enabled: true + name: ${_param:tenant_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + external_interface: + enabled: true + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + br-mgmt: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + mtu: ${_param:interface_mtu} + use_interfaces: + - ${_param:primary_interface} + 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-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml new file mode 100644 index 000000000..e3ae40505 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml @@ -0,0 +1,135 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + openstack_version: pike + apt_mk_version: nightly + mcp_repo_version: 1.1 + openstack_region: RegionOne + admin_email: root@localhost + cluster_public_protocol: http + cluster_public_host: 10.16.0.101 + neutron_public_protocol: http + neutron_control_dvr: 'False' + neutron_l3_ha: 'False' + neutron_global_physnet_mtu: 1500 + neutron_external_mtu: 1500 + neutron_gateway_dvr: 'False' + neutron_gateway_agent_mode: legacy + neutron_compute_dvr: 'False' + neutron_compute_agent_mode: legacy + neutron_compute_external_access: 'False' + galera_server_cluster_name: openstack_cluster + galera_server_maintenance_password: opnfv_secret + galera_server_admin_password: opnfv_secret + cluster_vip_address: ${_param:cluster_public_host} + cluster_local_address: ${_param:openstack_control_address} + cluster_node01_hostname: ctl01 + cluster_node01_address: 172.16.10.101 + cluster_node02_hostname: ctl02 + cluster_node02_address: 172.16.10.102 + cluster_node03_hostname: ctl03 + cluster_node03_address: 172.16.10.103 + rabbitmq_secret_key: opnfv_secret + rabbitmq_admin_password: opnfv_secret + rabbitmq_openstack_password: opnfv_secret + rabbitmq_cold_password: opnfv_secret + glance_version: ${_param:openstack_version} + glance_service_host: ${_param:cluster_local_address} + keystone_version: ${_param:openstack_version} + keystone_service_host: ${_param:cluster_local_address} + heat_version: ${_param:openstack_version} + heat_service_host: ${_param:cluster_local_address} + heat_domain_admin_password: opnfv_secret + ceilometer_version: ${_param:openstack_version} + ceilometer_service_host: ${_param:cluster_local_address} + ceilometer_database_host: ${_param:cluster_local_address} + cinder_version: ${_param:openstack_version} + cinder_service_host: ${_param:cluster_local_address} + ceilometer_graphite_publisher_host: 172.16.10.107 + ceilometer_graphite_publisher_port: 2013 + nova_version: ${_param:openstack_version} + nova_service_host: ${_param:cluster_local_address} + nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 + neutron_version: ${_param:openstack_version} + neutron_service_host: ${_param:cluster_local_address} + mysql_admin_user: root + mysql_admin_password: opnfv_secret + mysql_cinder_password: opnfv_secret + mysql_ceilometer_password: opnfv_secret + mysql_glance_password: opnfv_secret + mysql_grafana_password: opnfv_secret + mysql_heat_password: opnfv_secret + mysql_keystone_password: opnfv_secret + mysql_neutron_password: opnfv_secret + mysql_nova_password: opnfv_secret + mysql_aodh_password: opnfv_secret + keystone_service_token: opnfv_secret + keystone_admin_password: opnfv_secret + keystone_ceilometer_password: opnfv_secret + keystone_cinder_password: opnfv_secret + keystone_glance_password: opnfv_secret + keystone_heat_password: opnfv_secret + keystone_keystone_password: opnfv_secret + keystone_neutron_password: opnfv_secret + keystone_nova_password: opnfv_secret + ceilometer_secret_key: opnfv_secret + metadata_password: opnfv_secret + horizon_version: ${_param:openstack_version} + horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e + horizon_identity_host: ${_param:cluster_vip_address} + horizon_identity_encryption: none + horizon_identity_version: 2 + mongodb_server_replica_set: ceilometer + mongodb_ceilometer_password: opnfv_secret + mongodb_admin_password: opnfv_secret + mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth + aodh_version: ${_param:openstack_version} + keystone_aodh_password: opnfv_secret + aodh_service_host: ${_param:cluster_local_address} + linux: + system: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/pike main" + architectures: amd64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 + network: + host: + ctl: + address: ${_param:openstack_control_address} + names: + - ctl + - ctl.${_param:cluster_domain} + ctl01: + address: ${_param:openstack_control_node01_address} + names: + - ctl01 + - ctl01.${_param:cluster_domain} + gtw01: + address: ${_param:openstack_gateway_address} + names: + - gtw01 + - gtw01.${_param:cluster_domain} + cmp01: + address: 172.16.10.105 + names: + - cmp01 + - cmp01.${_param:cluster_domain} + cmp02: + address: 172.16.10.106 + names: + - cmp02 + - cmp02.${_param:cluster_domain} 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} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml new file mode 100644 index 000000000..a346bacab --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml @@ -0,0 +1,23 @@ +############################################################################## +# 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.infra.config + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + reclass: + storage: + node: + openstack_compute_node01: + params: + dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} + dpdk0_pci: '"0000:00:05.0"' + openstack_compute_node02: + params: + dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} + dpdk0_pci: '"0000:00:05.0"' diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml new file mode 100644 index 000000000..66d5e3fbd --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml @@ -0,0 +1,19 @@ +############################################################################## +# 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-ovs-dpdk.openstack + +parameters: + _param: + cluster_domain: virtual-mcp-pike-ovs-dpdk.local + cluster_name: virtual-mcp-pike-ovs-dpdk diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml new file mode 100644 index 000000000..72fe43a84 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml @@ -0,0 +1,34 @@ +############################################################################## +# 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.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk + - cluster.virtual-mcp-pike-common.openstack_compute + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + neutron: + compute: + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} + linux: + network: + interface: + dpdk0: + name: ${_param:dpdk0_name} + pci: ${_param:dpdk0_pci} + driver: igb_uio + enabled: true + bridge: br-prv + type: dpdk_ovs_port + n_rxq: 2 + br-prv: + enabled: true + type: dpdk_ovs_bridge diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml new file mode 100644 index 000000000..b368a2c68 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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.openvswitch.single + - cluster.virtual-mcp-pike-common.openstack_control + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + neutron: + server: + backend: + tenant_vlan_range: 1000:1999 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml new file mode 100644 index 000000000..07691fbf7 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml @@ -0,0 +1,26 @@ +############################################################################## +# 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 + - service.neutron.gateway.single + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + neutron: + gateway: + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} + linux: + network: + interface: + tenant_interface: + ovs_bridge: br-prv + br-prv: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml new file mode 100644 index 000000000..02d24caac --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml @@ -0,0 +1,21 @@ +############################################################################## +# 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,vlan" + compute_hugepages_size: 2M + compute_hugepages_count: 2048 + compute_hugepages_mount: /mnt/hugepages_2M + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml new file mode 100644 index 000000000..788fd2ffd --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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.infra.config + - cluster.virtual-mcp-pike-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml new file mode 100644 index 000000000..528125b30 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml @@ -0,0 +1,19 @@ +############################################################################## +# 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-ovs.openstack + +parameters: + _param: + cluster_domain: virtual-mcp-pike-ovs.local + cluster_name: virtual-mcp-pike-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml new file mode 100644 index 000000000..ea64da140 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml @@ -0,0 +1,23 @@ +############################################################################## +# 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-ovs +parameters: + linux: + network: + interface: + br-mesh: + enabled: true + type: bridge + 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-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml new file mode 100644 index 000000000..070e48880 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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.openvswitch.single + - cluster.virtual-mcp-pike-common.openstack_control + - cluster.virtual-mcp-pike-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml new file mode 100644 index 000000000..fe2f01281 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml @@ -0,0 +1,25 @@ +############################################################################## +# 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 + - service.neutron.gateway.single + - cluster.virtual-mcp-pike-ovs +parameters: + 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-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml new file mode 100644 index 000000000..5a4c444de --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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" diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml deleted file mode 100644 index 2dc5e6a69..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# 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-ocata-odl-router.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-ocata-odl-router.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml deleted file mode 100644 index 19afe46b4..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# 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-ocata-odl.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-ocata-odl.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml deleted file mode 100644 index f87897a85..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# 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-ocata-ovs-dpdk.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-ocata-ovs-dpdk.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml deleted file mode 100644 index 0be4100f7..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# 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-ocata-ovs.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-ocata-ovs.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml new file mode 100644 index 000000000..4b8e883cf --- /dev/null +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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-odl.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: virtual-mcp-pike-odl.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml new file mode 100644 index 000000000..bf68ab88d --- /dev/null +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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-ovs-dpdk.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: virtual-mcp-pike-ovs-dpdk.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml new file mode 100644 index 000000000..514946b1c --- /dev/null +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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-ovs.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: virtual-mcp-pike-ovs.local -- cgit 1.2.3-korg