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}")
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-ovs.local
+ domain: virtual-mcp-pike-ovs.local
states:
- openstack
- neutron_compute
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-ovs-dpdk.local
+ domain: virtual-mcp-pike-ovs-dpdk.local
states:
- dpdk
- openstack
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-odl-router.local
+ domain: virtual-mcp-pike-odl.local
states:
- opendaylight
- openstack
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
#. 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
+ - virtual-mcp-<release>-common
#. Cluster specific classes
- - baremetal-mcp-ocata-*
- - virtual-mcp-ocata-*
+ - baremetal-mcp-<release>-*
+ - virtual-mcp-<release>-*
##############################################################################
---
classes:
- - cluster.all-mcp-ocata-common.arch
- - cluster.all-mcp-ocata-common.opnfv
+ - cluster.all-mcp-arch-common.arch
+ - cluster.all-mcp-arch-common.opnfv
##############################################################################
---
classes:
- - cluster.all-mcp-ocata-common.opnfv.runtime
- - cluster.all-mcp-ocata-common.opnfv.pod_config
+ - cluster.all-mcp-arch-common.opnfv.runtime
+ - cluster.all-mcp-arch-common.opnfv.pod_config
---
classes:
- system.linux.system.single
- - cluster.all-mcp-ocata-common
+ - cluster.all-mcp-arch-common
# - cluster.baremetal-mcp-ocata-common.stacklight
# - cluster.baremetal-mcp-ocata-common.stacklight.client
parameters:
##############################################################################
---
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:
- - 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:
- - cluster.all-mcp-ocata-common
+ - cluster.all-mcp-arch-common
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- cluster.baremetal-mcp-ocata-ovs-ha.openstack
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.aodh.server.single
- system.horizon.server.single
- service.haproxy.proxy.single
- - cluster.virtual-mcp-ocata-common.haproxy_openstack_api
+ - cluster.virtual-mcp-pike-common.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-common
+ - nova-novncproxy
+ - novnc
+ - nova-api
+ - nova-conductor
+ - nova-consoleauth
+ - nova-scheduler
+ - python-novaclient
horizon:
server:
# yamllint disable-line rule:truthy
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
parameters:
_param:
---
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/pike 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.infra.config
+ - cluster.virtual-mcp-pike-odl
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.init_options
+ - cluster.virtual-mcp-pike-common.infra
+ - cluster.virtual-mcp-pike-odl.openstack
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-odl-router.local
- cluster_name: virtual-mcp-ocata-odl-router
+ cluster_domain: virtual-mcp-pike-odl.local
+ cluster_name: virtual-mcp-pike-odl
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
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.openstack_compute
+ - cluster.virtual-mcp-pike-odl
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.openstack_control
+ - cluster.virtual-mcp-pike-odl
parameters:
neutron:
server:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-pike-common.openstack_gateway
- system.neutron.gateway.opendaylight.single
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-pike-odl
parameters:
_param:
neutron_agents:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-pike-common.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
opendaylight_router: odl-router_v2
linux:
- system:
- repo:
- uca:
- source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
- architectures: amd64
- key_id: EC4926EA
- key_server: keyserver.ubuntu.com
network:
host:
odl01:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-pike-common.infra.config
+ - cluster.virtual-mcp-pike-ovs-dpdk
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-dpdk.openstack
+ - cluster.all-mcp-arch-common
+ - cluster.virtual-mcp-pike-common.init_options
+ - cluster.virtual-mcp-pike-common.infra
+ - cluster.virtual-mcp-pike-ovs-dpdk.openstack
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-ovs-dpdk.local
- cluster_name: virtual-mcp-ocata-ovs-dpdk
+ cluster_domain: virtual-mcp-pike-ovs-dpdk.local
+ cluster_name: virtual-mcp-pike-ovs-dpdk
- 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.openstack_compute
+ - cluster.virtual-mcp-pike-ovs-dpdk
parameters:
neutron:
compute:
---
classes:
- system.neutron.control.openvswitch.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-pike-common.openstack_control
+ - cluster.virtual-mcp-pike-ovs-dpdk
parameters:
neutron:
server:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-pike-common.openstack_gateway
- service.neutron.gateway.single
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-pike-ovs-dpdk
parameters:
neutron:
gateway:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-pike-common.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.infra.config
+ - cluster.virtual-mcp-pike-ovs
---
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.init_options
+ - cluster.virtual-mcp-pike-common.infra
+ - cluster.virtual-mcp-pike-ovs.openstack
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-ovs.local
- cluster_name: virtual-mcp-ocata-ovs
+ cluster_domain: virtual-mcp-pike-ovs.local
+ cluster_name: virtual-mcp-pike-ovs
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_compute
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-pike-common.openstack_compute
+ - cluster.virtual-mcp-pike-ovs
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.openstack_control
+ - cluster.virtual-mcp-pike-ovs
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-pike-common.openstack_gateway
- service.neutron.gateway.single
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-pike-ovs
parameters:
linux:
network:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-pike-common.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
+++ /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.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-odl.local
+ domain: virtual-mcp-pike-odl.local
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-ovs-dpdk.infra.config
+ - cluster.virtual-mcp-pike-ovs-dpdk.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.local
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-ovs.infra.config
+ - cluster.virtual-mcp-pike-ovs.infra.config
parameters:
_param:
linux_system_codename: xenial
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-ovs.local
+ domain: virtual-mcp-pike-ovs.local
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 -s ocata pike
SALT_INSTALL_END