From bf341b7e0d7e423044827f379e4b180e9dc897a1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 7 Jun 2018 17:19:27 +0400 Subject: [ha] Update OpenStack version to Queens * make cluster names version-agnostic * switch to mirror.mirantis.com * system reclass update Change-Id: I96394b3c9d8d38321289af8e3a4e8bbc5dd7a408 Signed-off-by: Michael Polenchuk --- .../cluster/mcp-pike-odl-ha/infra/config.yml | 23 ---------- .../classes/cluster/mcp-pike-odl-ha/infra/init.yml | 14 ------- .../cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 | 12 ------ .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 32 -------------- .../cluster/mcp-pike-odl-ha/infra/maas.yml.j2 | 22 ---------- .../classes/cluster/mcp-pike-odl-ha/init.yml | 12 ------ .../mcp-pike-odl-ha/opendaylight/control.yml.j2 | 30 ------------- .../cluster/mcp-pike-odl-ha/openstack/compute.yml | 17 -------- .../mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 | 49 ---------------------- .../cluster/mcp-pike-odl-ha/openstack/control.yml | 21 ---------- .../cluster/mcp-pike-odl-ha/openstack/database.yml | 12 ------ .../cluster/mcp-pike-odl-ha/openstack/init.yml.j2 | 26 ------------ .../mcp-pike-odl-ha/openstack/message_queue.yml | 12 ------ .../cluster/mcp-pike-odl-ha/openstack/proxy.yml | 28 ------------- .../mcp-pike-odl-ha/openstack/telemetry.yml | 12 ------ 15 files changed, 322 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha') diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml deleted file mode 100644 index b812dea89..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - system.reclass.storage.system.opendaylight_control_single - - cluster.mcp-pike-common-ha.infra.config - - cluster.mcp-pike-odl-ha.infra - - cluster.all-mcp-arch-common.infra.config_pdf -parameters: - reclass: - storage: - node: - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control - params: - linux_system_codename: xenial - single_address: ${_param:opendaylight_server_node01_single_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml deleted file mode 100644 index 419c05947..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.infra - - cluster.mcp-pike-odl-ha.openstack -parameters: - _param: - cluster_name: mcp-pike-odl-ha diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 deleted file mode 100644 index 385326561..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -{%- if conf.MCP_VCP %} -classes: - - cluster.mcp-pike-odl-ha.infra -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 deleted file mode 100644 index 5fc4776d9..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -{%- if conf.MCP_VCP %} -# NOTE(armband): we don't want to pull in salt.control for novcp -classes: - - cluster.mcp-pike-common-ha.infra.kvm - - cluster.mcp-pike-odl-ha.infra -parameters: - salt: - control: - size: # RAM 4096,8192,16384,32768,65536 - # Default production sizing - opendaylight.server: - cpu: 4 - ram: 8192 - disk_profile: small - net_profile: default - cluster: - internal: - node: - odl01: - name: ${_param:opendaylight_server_node01_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: opendaylight.server -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 deleted file mode 100644 index 153b493ce..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -{%- set cluster_arch = [] %} -{%- for node in conf.nodes %} - {%- if node.node.arch not in cluster_arch %} - {%- do cluster_arch.append(node.node.arch) %} - {%- endif %} -{%- endfor %} ---- -classes: - - cluster.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-odl-ha.infra -{%- if 'aarch64' not in cluster_arch %} -parameters: - _param: - hwe_kernel: 'ga-16.04' -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml deleted file mode 100644 index 80942c27f..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.all-mcp-arch-common - - cluster.mcp-pike-odl-ha.infra - - cluster.mcp-pike-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 deleted file mode 100644 index a5db82387..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - service.opendaylight.server.single - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport -{%- if conf.MCP_VCP %} - - cluster.mcp-pike-odl-ha -{%- endif %} -parameters: - _param: - linux_system_codename: xenial - opendaylight: - server: - odl_bind_ip: ${_param:single_address} - odl_rest_port: 8282 - java_min_mem: 6g - java_max_mem: 6g - router_enabled: true - karaf_features: - odl_default: - - odl-restconf-all - - odl-aaa-authn - netvirt: - - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml deleted file mode 100644 index 6c3e0d04c..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - service.neutron.gateway.opendaylight.single - - cluster.mcp-pike-common-ha.openstack_compute - - cluster.mcp-pike-odl-ha.openstack.compute_pdf - - cluster.mcp-pike-odl-ha.infra -parameters: - neutron: - gateway: - agent_mode: ${_param:neutron_gateway_agent_mode} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 deleted file mode 100644 index 7cf4c8864..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -{%- import 'net_map.j2' as nm with context %} -{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} -{%- set nics = { nm.cmp001.nic_private: True } %} -{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} -{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %} ---- -parameters: - linux: - network: - interface: -{%- for nic in nics %} - {{ nic }}: - enabled: true - type: eth - {%- if nic == nm.cmp001.nic_admin %} - proto: dhcp - {%- else %} - proto: manual - {%- endif %} - name: {{ nic }} -{%- endfor %} - -{%- for vlan in vlans %} - {%- if vlan | int > 0 %} - {{ vlans[vlan] }}.{{ vlan }}: - enabled: true - proto: manual - type: vlan - name: {{ vlans[vlan] }}.{{ vlan }} - use_interfaces: - - {{ vlans[vlan] }} - {%- endif %} -{%- endfor %} - - br-mesh: - enabled: true - type: bridge - address: ${_param:tenant_address} - netmask: 255.255.255.0 - mtu: 1500 - use_interfaces: - - {{ nm.cmp001.nic_private }}{% if vlan_private_start | int > 0 %}.{{ vlan_private_start }}{% endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml deleted file mode 100644 index e907e3d4c..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - system.neutron.control.opendaylight.cluster - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_control - - cluster.mcp-pike-odl-ha.infra -parameters: - keystone: - server: - openrc_extra: - # For HA, all public services are available through nginx on prx - sdn_controller_ip: ${_param:cluster_public_host} - sdn_username: admin # Hardcoded to default ODL values for now - sdn_password: admin diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml deleted file mode 100644 index 69cb24dbf..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_database - - cluster.mcp-pike-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 deleted file mode 100644 index 5a3b36fb1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_init -parameters: - _param: - # opendaylight options - opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} - - neutron_tenant_network_types: "flat,vxlan" -{%- if conf.MCP_VCP %} - linux: - network: - host: - odl01: - address: ${_param:opendaylight_service_host} - names: - - ${_param:opendaylight_server_node01_hostname} - - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain} -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml deleted file mode 100644 index 604728da1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_message_queue - - cluster.mcp-pike-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml deleted file mode 100644 index 3c6b3a2cf..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport - - cluster.mcp-pike-common-ha.openstack_proxy - - cluster.mcp-pike-odl-ha.infra.init_vcp -parameters: - nginx: - server: - site: - nginx_proxy_opendaylight_rest: - enabled: true - type: nginx_proxy - name: opendaylight_rest - check: false - proxy: - host: ${_param:opendaylight_service_host} - port: 8282 - protocol: http - host: - name: ${_param:nginx_proxy_openstack_api_host} - port: 8282 diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml deleted file mode 100644 index 20df2aab6..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_telemetry - - cluster.mcp-pike-odl-ha.infra.init_vcp -- cgit 1.2.3-korg