Code Review / armband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 7d9aea7)
p/fuel: Rebase after Fuel@OPNFV salt repo pinning 05/38305/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 27 Jul 2017 23:09:42 +0000 (01:09 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 27 Jul 2017 23:10:34 +0000 (01:10 +0200)
Change-Id: Iba6bc9f6588a9ad528de70a0f3bd200a5fe1ab1a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch patch | blob | history

diff --git a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
index 1b51d9d..9ba7ac3 100644 (file)
--- a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
+++ b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
@@ -26,19 +26,19 @@ index 605da89..c44168e 100755
    salt-key -Ay
 
 diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template
-index 811a58c..03ce35e 100644
+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/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
--echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/salt.list
+-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/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-+  echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/salt.list
++  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