summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-16 00:09:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-16 00:09:01 +0000
commit40f2e0e9a211949b416bf28fab5ae736d199c93b (patch)
tree047da8d1a65c0bc008c6880820e0bfcdd51dd2cd
parent6e71b19097781a7190bcec015afc62be7961fa43 (diff)
parent3816f1e8464e67127f33f0d588711c186ba3e681 (diff)
Merge "reclass: system: Pin Armband apt-mk to nightly ver" into stable/euphrates
-rw-r--r--patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
index 828fb600..b99fa735 100644
--- a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
+++ b/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
@@ -27,12 +27,12 @@ index 826969b..01b9cc5 100644
priority: 1100
package: '*'
+ armband_mcp_extra:
-+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_extra_version} extra"
++ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra"
+ architectures: arm64
+ key_url: "http://linux.enea.com/apt-mk/public.gpg"
+ clean_file: true
+ pin:
-+ - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
++ - pin: 'release a=nightly'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
@@ -84,10 +84,10 @@ index 2235b2c..be8ffd2 100644
+ priority: 1100
+ package: '*'
+ armband_mk_openstack:
-+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
++ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly ${_param:openstack_version}"
+ architectures: arm64
+ key_url: "http://linux.enea.com/apt-mk/public.gpg"
+ pin:
-+ - pin: 'release a=${_param:linux_system_repo_mk_openstack_version}'
++ - pin: 'release a=nightly'
+ priority: 1100
+ package: '*'