diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-11 15:45:17 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-11 15:45:17 +0200 |
| commit | d81ba0acaf68ad4d5e8db943395431558d77b638 (patch) | |
| tree | 322f4efca3aac3ac1ebeec635e6023a779c169e5 /patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch | |
| parent | 19ff638dcd1059fbb09f3b5d931f38f84791ec28 (diff) | |
p/fuel: Rebase after lib.sh VGA patch got upstream
Change-Id: Ibf6f633873e7dce9c38f6952710b7937b1290ac3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch new file mode 100644 index 00000000..43fe78af --- /dev/null +++ b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch @@ -0,0 +1,45 @@ +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 + +FIXME: Use https for fetching GPG repo key. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + mcp/scripts/salt.sh | 4 ++++ + mcp/scripts/user-data.template | 9 +++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh +index 36ee27b..5732f4c 100755 +--- a/mcp/scripts/salt.sh ++++ b/mcp/scripts/salt.sh +@@ -48,6 +48,10 @@ 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 " ++ 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 |