diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-28 01:09:42 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-28 01:10:34 +0200 |
| commit | e0197eafd11b2c05f8bda4f569212a77b7e4b992 (patch) | |
| tree | 894096b543f33f048950f7ffbc7e069c076ea159 /patches/opnfv-fuel | |
| parent | 7d9aea721f123aaa115a4c77d6c873c63e2044cc (diff) | |
p/fuel: Rebase after Fuel@OPNFV salt repo pinning
Change-Id: Iba6bc9f6588a9ad528de70a0f3bd200a5fe1ab1a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 1b51d9df..9ba7ac30 100644 --- 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 |