virtual_repos_pkgs=${virtual_repos_pkgs%^}
# Expand reclass and virsh network templates
-for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \
+for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-arch-common/opnfv/"*.template \
net_*.template; do
eval "cat <<-EOF
$(<"${tp}")
# Convert Pharos-compatible PDF to reclass network definitions
if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
- find "${RECLASS_CLUSTER_DIR}/${CLUSTER_DOMAIN%.local}" \
- "${RECLASS_CLUSTER_DIR}/${DEPLOY_TYPE}-mcp-ocata-common" \
- -name '*.j2' | while read -r tp
+ find "${RECLASS_CLUSTER_DIR}" -name '*.j2' | while read -r tp
do
if ! "${PHAROS_GEN_CONFIG_SCRIPT}" -y "${LOCAL_PDF}" \
-j "${tp}" > "${tp%.j2}"; then
domain: baremetal-mcp-ocata-ovs-ha.local
states:
- maas
+ - baremetal_init
- virtual_control_plane
- openstack_ha
- networks
domain: baremetal-mcp-ocata-ovs-dpdk-ha.local
states:
- maas
+ - baremetal_init
- virtual_control_plane
- dpdk
- openstack_ha
domain: baremetal-mcp-ocata-odl-ha.local
states:
- maas
+ - baremetal_init
- virtual_control_plane
- opendaylight
- openstack_ha
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-ovs.local
+ domain: virtual-mcp-pike-ovs-noha.local
states:
- - openstack
+ - openstack_noha
- neutron_compute
- networks
virtual:
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-ovs-dpdk.local
+ domain: virtual-mcp-pike-ovs-dpdk-noha.local
states:
- dpdk
- - openstack
+ - openstack_noha
- neutron_compute
- networks
virtual:
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-odl-router.local
+ domain: virtual-mcp-pike-odl-noha.local
states:
- opendaylight
- - openstack
+ - openstack_noha
- networks
virtual:
nodes:
--- /dev/null
+#!/bin/bash -e
+##############################################################################
+# 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
+##############################################################################
+
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
+# shellcheck disable=SC1090
+source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+
+# KVM, compute node prereqs
+# patch the networking module for Debian based distros
+debian_ip_source=/usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py
+salt -C 'kvm* or cmp*' file.line $debian_ip_source \
+ content='iface = iface.lower()' mode='delete'
+
+salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+ pattern="^\s{8}__salt__\['pkg.install'\]\('vlan'\)" \
+ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')"
+
+salt -C 'kvm*' pkg.install bridge-utils
+salt -C 'kvm*' state.apply linux.network
+salt -C 'cmp*' state.apply linux.system
+salt -C 'cmp*' state.apply linux.network || true
+salt -C 'kvm* or cmp*' system.reboot
+wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+ "tee /dev/stderr | grep -Fq 'Not connected'"
+
+salt -C 'kvm* or cmp*' state.apply linux,ntp,salt.minion
salt -I 'nova:compute' system.reboot
wait_for 90 "! salt -I 'nova:compute' test.ping | " \
"tee /dev/stderr | grep -Fq 'Not connected'"
-salt -I 'nova:compute' state.sls linux.network
-# switch to UCA repos since fuel-infra packages have bugs
-salt -I 'nova:compute' cmd.run 'rm -vrf /etc/apt/preferences.d/*'
-salt -I 'nova:compute' file.remove '/etc/apt/sources.list.d/mirantis_openstack.list'
-salt -I 'nova:compute' pkg.refresh_db
+salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
+salt -I 'nova:compute' service.restart openvswitch-switch
salt -I 'nova:compute' pkg.install libvirt-bin
salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm
salt -I 'memcached:server' state.sls memcached
salt -I 'haproxy:proxy' state.sls haproxy
-salt -I 'keystone:server' state.sls keystone.server
+set +e; salt -I 'keystone:server' state.sls keystone.server; set -e
salt -I 'keystone:server' service.restart apache2
+salt -I 'keystone:server' state.sls keystone.server
+
salt -I 'keystone:server' state.sls keystone.client
salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
salt -I 'nova:compute' state.sls nova
-salt -I 'mongodb:server' state.sls mongodb
+salt -I 'mongodb:server' state.sls mongodb || salt -I 'mongodb:server' state.sls mongodb
salt -I 'aodh:server' state.sls aodh
salt -I 'ceilometer:server' state.sls ceilometer
salt -I 'ceilometer:agent' state.sls ceilometer
done
fi
-# KVM, compute node prereqs (libvirt first), VCP deployment
-# patch the networking module for Debian based distros
-debian_ip_source=/usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py
-salt -C 'kvm* or cmp*' file.line $debian_ip_source \
- content='iface = iface.lower()' mode='delete'
-
-salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
- pattern="^\s{8}__salt__\['pkg.install'\]\('vlan'\)" \
- repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')"
-
-salt -C 'kvm*' pkg.install bridge-utils
-salt -C 'kvm*' state.apply linux.network
-salt -C 'cmp*' state.apply linux.system
-salt -C 'cmp*' state.apply linux.network || true
-salt -C 'kvm* or cmp*' system.reboot
-wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
- "tee /dev/stderr | grep -Fq 'Not connected'"
-
-salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
-
+# KVM libvirt first, VCP deployment
wait_for 5 "salt -C 'kvm*' state.sls libvirt"
-salt -C '* and not cfg01* and not mas01*' state.apply salt
-salt -C 'kvm*' saltutil.sync_all
+salt -C 'kvm* or cmp*' state.apply salt
wait_for 10 "! salt -C 'kvm*' state.sls salt.control | " \
"tee /dev/stderr | grep -Fq 'Not connected'"
# Disable proxy dhcp routes after installation
salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
args='unset new_routers'
+salt -C 'prx*' system.reboot
+wait_for 30 "! salt -C 'prx*' test.ping | " \
+ "tee /dev/stderr | grep -Fq 'Not connected'"
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 5 Aug 2017 02:03:01 +0200
-Subject: [PATCH] linux.network.interface: noifupdown support
-
-According to [1], salt states/network supports "noifupdown" as a
-parameter for each interface.
-Adjust salt formula part for `linux.network.interface`, by extending
-the "interface_params" in <linux/map.jinja> accordingly.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
----
-
-diff --git a/linux/map.jinja b/linux/map.jinja
---- a/linux/map.jinja
-+++ b/linux/map.jinja
-@@ -92,6 +92,7 @@
- 'hashing-algorithm',
- 'hardware-dma-ring-rx',
- 'hwaddr',
-+ 'noifupdown',
- ] %}
-
- {% set network = salt['grains.filter_by']({
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 23 Nov 2017 03:33:01 +0200
-Subject: [PATCH] maas: region: Allow subnets without fabrics
-
-Configuring subnets should be possible without explicitly configuring
-fabrics.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
-
-diff --git a/maas/region.sls b/maas/region.sls
---- a/maas/region.sls
-+++ b/maas/region.sls
-@@ -186,7 +186,9 @@
- - name: maas.process_subnets
- - require:
- - module: maas_config
-+ {%- if region.get('fabrics', False) %}
- - module: maas_fabrics
-+ {%- endif %}
- {%- endif %}
-
- {%- if region.get('devices', False) %}
/usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch
/usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch
/usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
-/usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch
/usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
-/usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch
-baremetal-mcp-ocata-common/infra/kvm_init.yml
-baremetal-mcp-ocata-common/openstack_compute_init.yml
-baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml
-baremetal-mcp-ocata-*/openstack/compute_init.yml
+**/*_pdf.yml
#. 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-<release>-common-ha
+ - virtual-mcp-<release>-common-noha
#. Cluster specific classes
- - baremetal-mcp-ocata-*
- - virtual-mcp-ocata-*
+ - baremetal-mcp-<release>-*-{ha,noha}
+ - virtual-mcp-<release>-*-{ha,noha}
##############################################################################
---
classes:
- - system.mysql.client.single
+ - cluster.all-mcp-arch-common.arch
+ - cluster.all-mcp-arch-common.opnfv
##############################################################################
---
classes:
- - cluster.all-mcp-ocata-common.arch
- - cluster.all-mcp-ocata-common.opnfv
+ - cluster.all-mcp-arch-common.opnfv.runtime
+ - cluster.all-mcp-arch-common.opnfv.pod_config
---
parameters:
_param:
- salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
+ 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
+++ /dev/null
-##############################################################################
-# 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
# - system.kibana.client.single
openstack_control_node01:
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_control_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_control_init
params:
linux_system_codename: xenial
openstack_control_node02:
linux_system_codename: xenial
openstack_database_node01:
classes:
- - cluster.${_param:cluster_name}.openstack.database_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_database_init
params:
linux_system_codename: xenial
openstack_database_node02:
---
classes:
- system.linux.system.single
- - cluster.all-mcp-ocata-common
- # - cluster.baremetal-mcp-ocata-common.stacklight
- # - cluster.baremetal-mcp-ocata-common.stacklight.client
+ - cluster.all-mcp-arch-common
+ # - cluster.baremetal-mcp-ocata-common-ha.stacklight
+ # - cluster.baremetal-mcp-ocata-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.baremetal-mcp-ocata-common.infra.kvm_init
+ - cluster.baremetal-mcp-ocata-common-ha.infra.kvm_pdf
parameters:
_param:
linux_system_codename: xenial
- system.cinder.volume.single
- system.cinder.volume.backend.lvm
- system.ceilometer.agent.cluster
- - cluster.baremetal-mcp-ocata-common.openstack_compute_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_compute_pdf
parameters:
_param:
cluster_vip_address: ${_param:openstack_control_address}
linux:
network:
interface:
- dhcp:
+ dhcp_int:
enabled: true
type: eth
proto: dhcp
address: ${_param:opnfv_net_mcpcontrol}
netmask: ${_param:opnfv_net_mcpcontrol_mask}
gateway: ${_param:opnfv_infra_maas_node01_deploy_address}
- single:
+ single_int:
enabled: true
type: eth
proto: static
address: 0.0.0.0
netmask: 0.0.0.0
gateway: ${_param:opnfv_net_public_gw}
- control:
+ control_int:
enabled: true
type: eth
proto: static
+++ /dev/null
-##############################################################################
-# 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}
---
classes:
- system.reclass.storage.system.opendaylight_control_single
- - cluster.baremetal-mcp-ocata-common.infra.config
+ - cluster.baremetal-mcp-ocata-common-ha.infra.config
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
reclass:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra
+ - cluster.baremetal-mcp-ocata-common-ha.infra
- cluster.baremetal-mcp-ocata-odl-ha.openstack
parameters:
_param:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.kvm
+ - cluster.baremetal-mcp-ocata-common-ha.infra.kvm
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
salt:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.maas
+ - cluster.baremetal-mcp-ocata-common-ha.infra.maas
- cluster.baremetal-mcp-ocata-odl-ha.infra
##############################################################################
---
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
---
classes:
- system.linux.system.repo.mcp.openstack
- - cluster.baremetal-mcp-ocata-common.openstack_compute
- - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_compute
+ - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_pdf
- cluster.baremetal-mcp-ocata-odl-ha.infra
- system.neutron.gateway.opendaylight.single
parameters:
---
classes:
- system.neutron.control.opendaylight.cluster
- - cluster.baremetal-mcp-ocata-common.openstack_control
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_control
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
neutron:
+++ /dev/null
-##############################################################################
-# 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.keystone.client.single
- - system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- - 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.designate
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_database
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_database
- cluster.baremetal-mcp-ocata-odl-ha
+++ /dev/null
-##############################################################################
-# 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.mysql.client.single
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_init
parameters:
_param:
# opendaylight options
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_message_queue
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue
- cluster.baremetal-mcp-ocata-odl-ha
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_proxy
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
nginx:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_telemetry
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry
- cluster.baremetal-mcp-ocata-odl-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.config
+ - cluster.baremetal-mcp-ocata-common-ha.infra.config
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init
+ - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_pdf
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra
+ - cluster.baremetal-mcp-ocata-common-ha.infra
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
parameters:
_param:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.kvm
+ - cluster.baremetal-mcp-ocata-common-ha.infra.kvm
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.maas
+ - cluster.baremetal-mcp-ocata-common-ha.infra.maas
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
##############################################################################
---
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
---
classes:
- system.linux.system.repo.mcp.openstack
- - cluster.baremetal-mcp-ocata-common.openstack_compute
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_compute
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- system.neutron.compute.nfv.dpdk
parameters:
---
classes:
- system.neutron.control.openvswitch.cluster
- - cluster.baremetal-mcp-ocata-common.openstack_control
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_control
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
neutron:
+++ /dev/null
-##############################################################################
-# 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.keystone.client.single
- - system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- - 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.designate
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_database
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_database
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
+++ /dev/null
-##############################################################################
-# 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.mysql.client.single
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_message_queue
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_proxy
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_telemetry
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.config
+ - cluster.baremetal-mcp-ocata-common-ha.infra.config
- cluster.baremetal-mcp-ocata-ovs-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra
+ - cluster.baremetal-mcp-ocata-common-ha.infra
- cluster.baremetal-mcp-ocata-ovs-ha.openstack
parameters:
_param:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.kvm
+ - cluster.baremetal-mcp-ocata-common-ha.infra.kvm
- cluster.baremetal-mcp-ocata-ovs-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.maas
+ - cluster.baremetal-mcp-ocata-common-ha.infra.maas
- cluster.baremetal-mcp-ocata-ovs-ha.infra
##############################################################################
---
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
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_compute
- - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_compute
+ - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_pdf
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
nova:
---
classes:
- system.neutron.control.openvswitch.cluster
- - cluster.baremetal-mcp-ocata-common.openstack_control
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_control
- cluster.baremetal-mcp-ocata-ovs-ha.infra
+++ /dev/null
-##############################################################################
-# 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.keystone.client.single
- - system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- - 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.designate
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_database
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_database
- cluster.baremetal-mcp-ocata-ovs-ha
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_message_queue
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue
- cluster.baremetal-mcp-ocata-ovs-ha
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_proxy
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-ha.infra
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_telemetry
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry
- cluster.baremetal-mcp-ocata-ovs-ha.infra
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
---
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.aodh.server.single
- system.horizon.server.single
- service.haproxy.proxy.single
- - cluster.virtual-mcp-ocata-common.haproxy_openstack_api
+ - cluster.virtual-mcp-pike-common-noha.haproxy_openstack_api
parameters:
_param:
linux_system_codename: xenial
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:
novncproxy_port: 6080
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
+ pkgs:
+ - nova-api
+ - nova-conductor
+ - nova-consoleauth
+ - nova-novncproxy
+ - nova-scheduler
+ - python-novaclient
horizon:
server:
# yamllint disable-line rule:truthy
# 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}
---
parameters:
_param:
- openstack_version: ocata
+ openstack_version: pike
apt_mk_version: nightly
mcp_repo_version: 1.1
openstack_region: RegionOne
aodh_service_host: ${_param:cluster_local_address}
linux:
system:
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
+ architectures: amd64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
kernel:
sysctl:
net.ipv4.tcp_congestion_control: yeah
---
classes:
- system.reclass.storage.system.opendaylight_control_single
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-pike-common-noha.infra.config
+ - cluster.virtual-mcp-pike-odl-noha
parameters:
reclass:
storage:
---
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
+ - cluster.all-mcp-arch-common
+ - cluster.virtual-mcp-pike-common-noha.init_options
+ - cluster.virtual-mcp-pike-common-noha.infra
+ - cluster.virtual-mcp-pike-odl-noha.openstack
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-odl-router.local
- cluster_name: virtual-mcp-ocata-odl-router
+ cluster_domain: virtual-mcp-pike-odl-noha.local
+ cluster_name: virtual-mcp-pike-odl-noha
opendaylight_service_host: 172.16.10.111
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.opendaylight.server.single
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-pike-odl-noha
parameters:
_param:
linux_system_codename: xenial
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_compute
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-pike-common-noha.openstack_compute
+ - cluster.virtual-mcp-pike-odl-noha
parameters:
opendaylight:
client:
---
classes:
- system.neutron.control.opendaylight.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-pike-common-noha.openstack_control
+ - cluster.virtual-mcp-pike-odl-noha
parameters:
neutron:
server:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-pike-common-noha.openstack_gateway
- system.neutron.gateway.opendaylight.single
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-pike-odl-noha
parameters:
_param:
neutron_agents:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-pike-common-noha.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:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-pike-common-noha.infra.config
+ - cluster.virtual-mcp-pike-ovs-dpdk-noha
parameters:
reclass:
storage:
---
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
+ - cluster.all-mcp-arch-common
+ - cluster.virtual-mcp-pike-common-noha.init_options
+ - cluster.virtual-mcp-pike-common-noha.infra
+ - cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-ovs.local
- cluster_name: virtual-mcp-ocata-ovs
+ cluster_domain: virtual-mcp-pike-ovs-dpdk-noha.local
+ cluster_name: virtual-mcp-pike-ovs-dpdk-noha
##############################################################################
---
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
+ - cluster.virtual-mcp-pike-common-noha.openstack_compute
+ - cluster.virtual-mcp-pike-ovs-dpdk-noha
parameters:
neutron:
compute:
tenant_network_types: ${_param:neutron_tenant_network_types}
linux:
network:
+ dpdk_pkgs:
+ - dpdk
+ - dpdk-dev
+ - dpdk-igb-uio-dkms
+ - dpdk-rte-kni-dkms
interface:
dpdk0:
name: ${_param:dpdk0_name}
---
classes:
- system.neutron.control.openvswitch.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-pike-common-noha.openstack_control
+ - cluster.virtual-mcp-pike-ovs-dpdk-noha
parameters:
neutron:
server:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-pike-common-noha.openstack_gateway
- service.neutron.gateway.single
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-pike-ovs-dpdk-noha
parameters:
neutron:
gateway:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-pike-common-noha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-pike-common-noha.infra.config
+ - cluster.virtual-mcp-pike-ovs-noha
---
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
+ - cluster.all-mcp-arch-common
+ - cluster.virtual-mcp-pike-common-noha.init_options
+ - cluster.virtual-mcp-pike-common-noha.infra
+ - cluster.virtual-mcp-pike-ovs-noha.openstack
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-ovs-dpdk.local
- cluster_name: virtual-mcp-ocata-ovs-dpdk
+ cluster_domain: virtual-mcp-pike-ovs-noha.local
+ cluster_name: virtual-mcp-pike-ovs-noha
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_compute
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-pike-common-noha.openstack_compute
+ - cluster.virtual-mcp-pike-ovs-noha
parameters:
linux:
network:
---
classes:
- system.neutron.control.openvswitch.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-pike-common-noha.openstack_control
+ - cluster.virtual-mcp-pike-ovs-noha
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-pike-common-noha.openstack_gateway
- service.neutron.gateway.single
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-pike-ovs-noha
parameters:
linux:
network:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-pike-common-noha.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
-Subproject commit 58cebbd45db86c92e89abd33b98827863306eee1
+Subproject commit 79f99eb5c290b346bb663ec8142eb3eafeb0a7e8
+++ /dev/null
-##############################################################################
-# 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
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-odl.infra.config
+ - cluster.virtual-mcp-pike-odl-noha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-odl.local
+ domain: virtual-mcp-pike-odl-noha.local
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-ovs-dpdk.infra.config
+ - cluster.virtual-mcp-pike-ovs-dpdk-noha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-ovs-dpdk.local
+ domain: virtual-mcp-pike-ovs-dpdk-noha.local
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-ovs.infra.config
+ - cluster.virtual-mcp-pike-ovs-noha.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-ovs.local
+ domain: virtual-mcp-pike-ovs-noha.local
local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
virsh net-update "mcpcontrol" add ip-dhcp-host \
- "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live
+ "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live --config
[ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \
- "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live
+ "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config
}
function start_vms {
OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv"
OPNFV_GIT_DIR="/root/opnfv"
OPNFV_FUEL_DIR="/root/fuel"
-OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common"
+OPNFV_RDIR="reclass/classes/cluster/all-mcp-arch-common"
OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img"
OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images"
LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}"
mkdir -p "${OPNFV_VCP_DIR}"
mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/"
fi
+
+ # symlink manually until package with required commit is available
+ cd /usr/share/salt-formulas/env/aodh/files
+ ln -sf ocata pike
SALT_INSTALL_END