+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 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: Tue, 11 Jul 2017 18:57:57 +0200
-Subject: [PATCH] salt.sh, user-data: Add Saltstack arm64 repo
-
-While at it, add arm64 suppport to salt-master-setup.sh.
-Upstream commit [1] broke Salt bootstrap on AArch64, by
-introducing an architecture condition that is too strict to allow
-Debian package installation (even if we provide our own repo).
-
-Add "arm64" to the list of supported architectures. This needs
-to be done on the fly, as the bootstrap script is fetched using
-`curl` from <salt-master-setup.sh>, which is also fetched
-dynamically using `svn export`.
-
-[1] https://github.com/saltstack/salt-bootstrap/commit/caa6d7d
-
-FIXME: Use https for fetching GPG repo key.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/scripts/salt.sh | 6 ++++++
- mcp/scripts/user-data.template | 9 +++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
-index b291b0f..44db0a1 100755
---- a/mcp/scripts/salt.sh
-+++ b/mcp/scripts/salt.sh
-@@ -45,6 +45,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
- cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
-
- cd /srv/salt/scripts
-+ if [ "\$(uname -i)" = "aarch64" ]; then
-+ # NOTE(armband): On AArch64, skip creating apt source list definitions (-r)
-+ export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.3 "
-+ sed -i 's/bootstrap.saltstack.com | $SUDO/bootstrap.saltstack.com | sed '"'"'s@"amd64")@"amd64"|"arm64")@g'"'"' | $SUDO/g' \
-+ ./salt-master-setup.sh
-+ fi
- MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh
- salt-key -Ay
-
-diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template
-index cc97a60..c696d35 100644
---- a/mcp/scripts/user-data.template
-+++ b/mcp/scripts/user-data.template
-@@ -1,6 +1,11 @@
- #!/bin/bash
--wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
--echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list
-+if [ "$(uname -i)" = "aarch64" ]; then
-+ wget -O - http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-+ echo "deb http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest xenial main" > /etc/apt/sources.list.d/salt.list
-+else
-+ wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-+ echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list
-+fi
- apt update
- apt-get install -y salt-minion
- rm /etc/salt/minion_id
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index 6f0c52c..cd1456a 100644
+index 6d2c7f3..3dd94e6 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-@@ -20,10 +20,9 @@ parameters:
+@@ -23,10 +23,9 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
-@@ -57,12 +56,6 @@ parameters:
+@@ -61,12 +60,6 @@ parameters:
type: eth
proto: manual
name: ${_param:tenant_nic}
br-mesh:
enabled: true
type: bridge
-@@ -70,19 +63,19 @@ parameters:
+@@ -74,19 +67,19 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
use_interfaces:
- ${_param:tenant_nic}
br-ctl:
-@@ -92,7 +85,7 @@ parameters:
+@@ -96,7 +89,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
br-floating:
enabled: true
type: ovs_bridge
-@@ -109,7 +102,6 @@ parameters:
+@@ -113,7 +106,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
- float-to-ex
-
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
-index e8666d6..149d29d 100644
+index b46e23d..040ea2c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
@@ -23,7 +23,7 @@ classes:
# MaaS has issues using MTU > 1500 for PXE interface
pxe_interface_mtu: 1500
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-index 070ab78..88150b0 100644
+index e11e35e..cea8c81 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-@@ -19,9 +19,8 @@ parameters:
+@@ -22,9 +22,8 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
linux_system_codename: xenial
interface_mtu: 1500
keepalived_vip_interface: br-ctl
-@@ -40,12 +39,6 @@ parameters:
+@@ -44,12 +43,6 @@ parameters:
type: eth
proto: manual
name: ${_param:tenant_nic}
br-mesh:
enabled: true
type: bridge
-@@ -53,19 +46,19 @@ parameters:
+@@ -57,19 +50,19 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
use_interfaces:
- ${_param:tenant_nic}
br-ctl:
-@@ -75,7 +68,7 @@ parameters:
+@@ -79,7 +72,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
br-floating:
enabled: true
type: ovs_bridge
-@@ -92,6 +85,6 @@ parameters:
+@@ -96,6 +89,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
use_ovs_ports:
- float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
-index a5913dd..638abba 100644
+index 1711ab0..0571320 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
@@ -23,7 +23,7 @@ classes:
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index cd1456a..c53f77f 100644
+index 3dd94e6..cfdba30 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-@@ -3,8 +3,8 @@ classes:
- - system.linux.system.repo.mcp.extra
+@@ -4,8 +4,8 @@ classes:
- system.linux.system.repo.saltstack.xenial
+ - system.linux.storage.loopback
- system.nova.compute.cluster
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
+#- system.nova.compute.nfv.cpu_pinning
- system.neutron.gateway.opendaylight.single
- system.neutron.gateway.cluster
- - system.ceilometer.agent.cluster
+ - system.cinder.volume.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index ad99447..ea95680 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
glance_service_host: ${_param:openstack_control_address}
keystone_version: ${_param:openstack_version}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-index 88150b0..8bcb469 100644
+index cea8c81..3c48cff 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-@@ -3,8 +3,8 @@ classes:
- - system.linux.system.repo.mcp.extra
+@@ -4,8 +4,8 @@ classes:
- system.linux.system.repo.saltstack.xenial
+ - system.linux.storage.loopback
- system.nova.compute.cluster
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
+#- system.nova.compute.nfv.hugepages
+#- system.nova.compute.nfv.cpu_pinning
- system.neutron.gateway.cluster
- - system.ceilometer.agent.cluster
- - cluster.baremetal-mcp-ocata-ovs-ha.infra
+ - system.cinder.volume.single
+ - system.cinder.volume.backend.lvm
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
index 90e0cf3..c1452b4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-Subproject commit 81c74a3da29cabc3fe76d3b5467378d84fd2767e
+Subproject commit 978fd9da91b6cdd522e79a4b8c31cf8f800222a3
Code Review / armband.git / commitdiff