{%- endfor %}
---
cluster:
- domain: mcp-pike-ovs-ha.local
+ domain: mcp-ovs-ha.local
states:
{%- if cluster.has_baremetal_nodes %}
- maas
{%- endfor %}
---
cluster:
- domain: mcp-pike-ovs-dpdk-ha.local
+ domain: mcp-ovs-dpdk-ha.local
states:
{%- if cluster.has_baremetal_nodes %}
- maas
{%- endfor %}
---
cluster:
- domain: mcp-pike-odl-ha.local
+ domain: mcp-odl-ha.local
states:
{%- if cluster.has_baremetal_nodes %}
- maas
{%- endfor %}
---
cluster:
- domain: mcp-pike-ovn-ha.local
+ domain: mcp-ovn-ha.local
states:
{%- if cluster.has_baremetal_nodes %}
- maas
**/*_pdf.yml
-mcp-pike-common-ha/infra/init.yml
-mcp-pike-common-ha/openstack_control.yml
-mcp-pike-common-ha/openstack_init.yml
-mcp-pike-common-ha/openstack_interface_vcp_biport.yml
-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
-mcp-pike-common-ha/openstack_proxy.yml
-mcp-pike-ovs-ha/infra/init_vcp.yml
-mcp-pike-ovs-ha/infra/kvm.yml
-mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml
-mcp-pike-ovs-dpdk-ha/infra/kvm.yml
-mcp-pike-odl-ha/infra/init_vcp.yml
-mcp-pike-odl-ha/infra/kvm.yml
-mcp-pike-ovn-ha/infra/init_vcp.yml
-mcp-pike-ovn-ha/infra/kvm.yml
-mcp-pike-odl-ha/opendaylight/control.yml
-mcp-pike-odl-ha/openstack/init.yml
+mcp-common-ha/infra/init.yml
+mcp-common-ha/openstack_control.yml
+mcp-common-ha/openstack_init.yml
+mcp-common-ha/openstack_interface_vcp_biport.yml
+mcp-common-ha/openstack_interface_vcp_triport.yml
+mcp-common-ha/openstack_proxy.yml
+mcp-ovs-ha/infra/init_vcp.yml
+mcp-ovs-ha/infra/kvm.yml
+mcp-ovs-dpdk-ha/infra/init_vcp.yml
+mcp-ovs-dpdk-ha/infra/kvm.yml
+mcp-odl-ha/infra/init_vcp.yml
+mcp-odl-ha/infra/kvm.yml
+mcp-ovn-ha/infra/init_vcp.yml
+mcp-ovn-ha/infra/kvm.yml
+mcp-odl-ha/opendaylight/control.yml
+mcp-odl-ha/openstack/init.yml
mcp-odl-noha/infra/config.yml
mcp-odl-noha/openstack/compute.yml
# - system.reclass.storage.system.stacklight_monitor_cluster
# - system.reclass.storage.system.stacklight_telemetry_cluster
- system.reclass.storage.system.infra_maas_single
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
parameters:
_param:
salt_master_base_environment: prd
# - system.kibana.client.single
openstack_control_node01:
classes:
- - cluster.mcp-pike-common-ha.openstack_control_init
+ - cluster.mcp-common-ha.openstack_control_init
params:
linux_system_codename: xenial
# NOTE: When VCP is present, external_address is not used
external_address: ${_param:openstack_proxy_node02_address}
openstack_database_node01:
classes:
- - cluster.mcp-pike-common-ha.openstack_database_init
+ - cluster.mcp-common-ha.openstack_database_init
params:
linux_system_codename: xenial
openstack_database_node02:
classes:
- system.linux.system.single
- cluster.all-mcp-arch-common
- # - cluster.mcp-pike-common-ha.stacklight
- # - cluster.mcp-pike-common-ha.stacklight.client
+ # - cluster.mcp-common-ha.stacklight
+ # - cluster.mcp-common-ha.stacklight.client
parameters:
_param:
apt_mk_version: nightly
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- - cluster.mcp-pike-common-ha.infra.kvm_pdf
- - cluster.mcp-pike-common-ha.include.maas_proxy
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.infra.kvm_pdf
+ - cluster.mcp-common-ha.include.maas_proxy
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
parameters:
_param:
linux_system_codename: xenial
classes:
- system.maas.region.single
- service.maas.cluster.single
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
- - cluster.mcp-pike-common-ha.infra.maas_pdf
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.infra.maas_pdf
parameters:
_param:
dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- system.linux.system.repo.glusterfs
- system.glusterfs.client.cluster
- system.nova.compute.cluster
- system.cinder.volume.backend.lvm
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
- - cluster.mcp-pike-common-ha.openstack_compute_pdf
- - cluster.mcp-pike-common-ha.include.maas_proxy
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.openstack_compute_pdf
+ - cluster.mcp-common-ha.include.maas_proxy
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
parameters:
_param:
cluster_vip_address: ${_param:openstack_control_address}
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- system.linux.system.repo.glusterfs
- system.ceilometer.client
- system.memcached.server.single
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- - cluster.mcp-pike-common-ha.infra.kvm_pdf
- - cluster.mcp-pike-common-ha.include.maas_proxy
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.infra.kvm_pdf
+ - cluster.mcp-common-ha.include.maas_proxy
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
{%- endif %}
parameters:
_param:
- system.keystone.client.service.designate
- system.keystone.client.service.gnocchi
- system.keystone.client.service.panko
+ - system.keystone.client.v3.service.keystone
+parameters:
+ keystone:
+ client:
+ enabled: true
+ resources:
+ v3:
+ enabled: true
+ server:
+ identity:
+ admin:
+ api_version: 3
+ admin_identity:
+ admin:
+ api_version: ''
+ user_domain_name: 'Default'
+ project_domain_name: 'Default'
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- system.galera.server.cluster
- system.galera.server.database.aodh
- system.galera.server.database.ceilometer
parameters:
_param:
- openstack_version: pike
+ openstack_version: queens
# openstack service addresses
{%- if conf.MCP_VCP %}
net.ipv4.tcp_congestion_control: yeah
net.ipv4.tcp_slow_start_after_idle: 0
net.ipv4.tcp_fin_timeout: 30
+ package:
+ python-tornado:
+ version: latest
network:
host:
{%- if conf.MCP_VCP %}
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-pike-common-ha.include.maas_proxy
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.include.maas_proxy
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
parameters:
_param:
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-pike-common-ha.include.maas_proxy
- - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
+ - cluster.mcp-common-ha.include.maas_proxy
+ - cluster.mcp-common-ha.include.lab_proxy_pdf
parameters:
_param:
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
parameters:
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.mirror.v1.openstack
- service.redis.server.single
- system.ceilometer.server.cluster
- system.ceilometer.server.coordination.redis
---
classes:
- system.reclass.storage.system.opendaylight_control_single
- - cluster.mcp-pike-common-ha.infra.config
- - cluster.mcp-pike-odl-ha.infra
+ - cluster.mcp-common-ha.infra.config
+ - cluster.mcp-odl-ha.infra
- cluster.all-mcp-arch-common.infra.config_pdf
parameters:
reclass:
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra
- - cluster.mcp-pike-ovn-ha.openstack
+ - cluster.mcp-common-ha.infra
+ - cluster.mcp-odl-ha.openstack
parameters:
_param:
- cluster_name: mcp-pike-ovn-ha
+ cluster_name: mcp-odl-ha
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-pike-ovn-ha.infra
+ - cluster.mcp-odl-ha.infra
{%- endif %}
{%- 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
+ - cluster.mcp-common-ha.infra.kvm
+ - cluster.mcp-odl-ha.infra
parameters:
salt:
control:
{%- endfor %}
---
classes:
- - cluster.mcp-pike-common-ha.infra.maas
- - cluster.mcp-pike-odl-ha.infra
+ - cluster.mcp-common-ha.infra.maas
+ - cluster.mcp-odl-ha.infra
{%- if 'aarch64' not in cluster_arch %}
parameters:
_param:
---
classes:
- cluster.all-mcp-arch-common
- - cluster.mcp-pike-ovn-ha.infra
- - cluster.mcp-pike-ovn-ha.openstack
+ - cluster.mcp-odl-ha.infra
+ - cluster.mcp-odl-ha.openstack
---
classes:
- service.opendaylight.server.single
- - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
{%- if conf.MCP_VCP %}
- - cluster.mcp-pike-odl-ha
+ - cluster.mcp-odl-ha
{%- endif %}
parameters:
_param:
---
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
+ - cluster.mcp-common-ha.openstack_compute
+ - cluster.mcp-odl-ha.openstack.compute_pdf
+ - cluster.mcp-odl-ha.infra
parameters:
neutron:
gateway:
---
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
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_control
+ - cluster.mcp-odl-ha.infra
parameters:
keystone:
server:
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_database
+ - cluster.mcp-odl-ha.infra.init_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_init
+ - cluster.mcp-common-ha.openstack_init
parameters:
_param:
# opendaylight options
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_message_queue
+ - cluster.mcp-odl-ha.infra.init_vcp
##############################################################################
---
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
+ - cluster.mcp-common-ha.openstack_interface_vcp_triport
+ - cluster.mcp-common-ha.openstack_proxy
+ - cluster.mcp-odl-ha.infra.init_vcp
parameters:
nginx:
server:
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_telemetry
+ - cluster.mcp-odl-ha.infra.init_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra.config
- - cluster.mcp-pike-ovn-ha.infra
+ - cluster.mcp-common-ha.infra.config
+ - cluster.mcp-ovn-ha.infra
- cluster.all-mcp-arch-common.infra.config_pdf
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra
- - cluster.mcp-pike-ovs-ha.openstack
+ - cluster.mcp-common-ha.infra
+ - cluster.mcp-ovn-ha.openstack
parameters:
_param:
- cluster_name: mcp-pike-ovs-ha
+ cluster_name: mcp-ovn-ha
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-pike-odl-ha.infra
+ - cluster.mcp-ovn-ha.infra
{%- endif %}
{%- 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-ovs-ha.infra
+ - cluster.mcp-common-ha.infra.kvm
+ - cluster.mcp-ovn-ha.infra
{%- endif %}
--- /dev/null
+##############################################################################
+# 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-common-ha.infra.maas
+ - cluster.mcp-ovn-ha.infra
---
classes:
- cluster.all-mcp-arch-common
- - cluster.mcp-pike-odl-ha.infra
- - cluster.mcp-pike-odl-ha.openstack
+ - cluster.mcp-ovn-ha.infra
+ - cluster.mcp-ovn-ha.openstack
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_compute
- - cluster.mcp-pike-ovs-ha.openstack.compute_pdf
- - cluster.mcp-pike-ovs-ha.infra
+ - cluster.mcp-common-ha.openstack_compute
+ - cluster.mcp-ovn-ha.openstack.compute_pdf
+ - cluster.mcp-ovn-ha.infra
parameters:
nova:
compute:
---
classes:
- system.neutron.control.openvswitch.cluster
- - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_control
- - cluster.mcp-pike-ovn-ha.infra
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_control
+ - cluster.mcp-ovn-ha.infra
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_database
+ - cluster.mcp-ovn-ha.infra_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_init
+ - cluster.mcp-common-ha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_message_queue
+ - cluster.mcp-ovn-ha.infra_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra
- - cluster.mcp-pike-odl-ha.openstack
-parameters:
- _param:
- cluster_name: mcp-pike-odl-ha
+ - cluster.mcp-common-ha.openstack_interface_vcp_triport
+ - cluster.mcp-common-ha.openstack_proxy
+ - cluster.mcp-ovn-ha.infra_vcp
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_telemetry
+ - cluster.mcp-ovn-ha.infra_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra.config
- - cluster.mcp-pike-ovs-dpdk-ha.infra
+ - cluster.mcp-common-ha.infra.config
+ - cluster.mcp-ovs-dpdk-ha.infra
- cluster.all-mcp-arch-common.infra.config_dpdk_pdf
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra
- - cluster.mcp-pike-ovs-dpdk-ha.openstack
+ - cluster.mcp-common-ha.infra
+ - cluster.mcp-ovs-dpdk-ha.openstack
parameters:
_param:
- cluster_name: mcp-pike-ovs-dpdk-ha
+ cluster_name: mcp-ovs-dpdk-ha
linux:
system:
service:
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-pike-ovs-ha.infra
+ - cluster.mcp-ovs-dpdk-ha.infra
{%- endif %}
{%- 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-ovn-ha.infra
+ - cluster.mcp-common-ha.infra.kvm
+ - cluster.mcp-ovs-dpdk-ha.infra
{%- endif %}
--- /dev/null
+##############################################################################
+# 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-common-ha.infra.maas
+ - cluster.mcp-ovs-dpdk-ha.infra
---
classes:
- cluster.all-mcp-arch-common
- - cluster.mcp-pike-ovs-ha.infra
- - cluster.mcp-pike-ovs-ha.openstack
+ - cluster.mcp-ovs-dpdk-ha.infra
+ - cluster.mcp-ovs-dpdk-ha.openstack
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_compute
- - cluster.mcp-pike-ovs-dpdk-ha.infra
- - cluster.mcp-pike-ovs-dpdk-ha.openstack.compute_pdf
+ - cluster.mcp-common-ha.openstack_compute
+ - cluster.mcp-ovs-dpdk-ha.infra
+ - cluster.mcp-ovs-dpdk-ha.openstack.compute_pdf
- system.neutron.compute.nfv.dpdk
parameters:
neutron:
---
classes:
- system.neutron.control.openvswitch.cluster
- - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_control
- - cluster.mcp-pike-ovs-dpdk-ha.infra
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_control
+ - cluster.mcp-ovs-dpdk-ha.infra
parameters:
neutron:
server:
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_database
+ - cluster.mcp-ovs-dpdk-ha.infra.init_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_init
+ - cluster.mcp-common-ha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_message_queue
+ - cluster.mcp-ovs-dpdk-ha.infra.init_vcp
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_triport
+ - cluster.mcp-common-ha.openstack_proxy
+ - cluster.mcp-ovs-dpdk-ha.infra.init_vcp
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_telemetry
+ - cluster.mcp-ovs-dpdk-ha.infra.init_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.infra.config
- - cluster.mcp-pike-ovs-ha.infra
+ - cluster.mcp-common-ha.infra.config
+ - cluster.mcp-ovs-ha.infra
- cluster.all-mcp-arch-common.infra.config_pdf
--- /dev/null
+##############################################################################
+# 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-common-ha.infra
+ - cluster.mcp-ovs-ha.openstack
+parameters:
+ _param:
+ cluster_name: mcp-ovs-ha
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-pike-ovs-dpdk-ha.infra
+ - cluster.mcp-ovs-ha.infra
{%- endif %}
{%- 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-ovs-dpdk-ha.infra
+ - cluster.mcp-common-ha.infra.kvm
+ - cluster.mcp-ovs-ha.infra
{%- endif %}
--- /dev/null
+##############################################################################
+# 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-common-ha.infra.maas
+ - cluster.mcp-ovs-ha.infra
---
classes:
- cluster.all-mcp-arch-common
- - cluster.mcp-pike-ovs-dpdk-ha.infra
- - cluster.mcp-pike-ovs-dpdk-ha.openstack
+ - cluster.mcp-ovs-ha.infra
+ - cluster.mcp-ovs-ha.openstack
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_compute
- - cluster.mcp-pike-ovn-ha.openstack.compute_pdf
- - cluster.mcp-pike-ovn-ha.infra
+ - cluster.mcp-common-ha.openstack_compute
+ - cluster.mcp-ovs-ha.openstack.compute_pdf
+ - cluster.mcp-ovs-ha.infra
parameters:
nova:
compute:
---
classes:
- system.neutron.control.openvswitch.cluster
- - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_control
- - cluster.mcp-pike-ovs-ha.infra
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_control
+ - cluster.mcp-ovs-ha.infra
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_database
+ - cluster.mcp-ovs-ha.infra.init_vcp
##############################################################################
---
classes:
- - cluster.mcp-pike-common-ha.openstack_init
+ - cluster.mcp-common-ha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_message_queue
+ - cluster.mcp-ovs-ha.infra.init_vcp
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_triport
+ - cluster.mcp-common-ha.openstack_proxy
+ - cluster.mcp-ovs-ha.infra.init_vcp
--- /dev/null
+##############################################################################
+# 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-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_telemetry
+ - cluster.mcp-ovs-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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
+++ /dev/null
-##############################################################################
-# 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
+++ /dev/null
-##############################################################################
-# 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
+++ /dev/null
-##############################################################################
-# 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.maas
- - cluster.mcp-pike-ovn-ha.infra
+++ /dev/null
-##############################################################################
-# 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-ovn-ha.infra_vcp
+++ /dev/null
-##############################################################################
-# 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-ovn-ha.infra_vcp
+++ /dev/null
-##############################################################################
-# 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-ovn-ha.infra_vcp
+++ /dev/null
-##############################################################################
-# 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-ovn-ha.infra_vcp
+++ /dev/null
-##############################################################################
-# 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.maas
- - cluster.mcp-pike-ovs-dpdk-ha.infra
+++ /dev/null
-##############################################################################
-# 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-ovs-dpdk-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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-ovs-dpdk-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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-ovs-dpdk-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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-ovs-dpdk-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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.maas
- - cluster.mcp-pike-ovs-ha.infra
+++ /dev/null
-##############################################################################
-# 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-ovs-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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-ovs-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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-ovs-ha.infra.init_vcp
+++ /dev/null
-##############################################################################
-# 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-ovs-ha.infra.init_vcp
-Subproject commit 3d227a7e3be6d3da6a459cc8254637be2228d1fb
+Subproject commit 0d3fc1ed410c463df962315621aff4b2235825d2
##############################################################################
---
classes:
- - cluster.mcp-pike-odl-ha.infra.config
+ - cluster.mcp-odl-ha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: mcp-pike-odl-ha.local
+ domain: mcp-odl-ha.local
##############################################################################
---
classes:
- - cluster.mcp-pike-ovn-ha.infra.config
+ - cluster.mcp-ovn-ha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: mcp-pike-ovn-ha.local
+ domain: mcp-ovn-ha.local
##############################################################################
---
classes:
- - cluster.mcp-pike-ovs-dpdk-ha.infra.config
+ - cluster.mcp-ovs-dpdk-ha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: mcp-pike-ovs-dpdk-ha.local
+ domain: mcp-ovs-dpdk-ha.local
##############################################################################
---
classes:
- - cluster.mcp-pike-ovs-ha.infra.config
+ - cluster.mcp-ovs-ha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: mcp-pike-ovs-ha.local
+ domain: mcp-ovs-ha.local
Code Review / fuel.git / commitdiff