Updates/Fixes for apt repos.
diff --git a/linux/system/repo/contrail.yml b/linux/system/repo/contrail.yml
index b282fc8..82b16a5 100644
--- a/linux/system/repo/contrail.yml
+++ b/linux/system/repo/contrail.yml
@@ -1,6 +1,7 @@
parameters:
_param:
linux_repo_contrail_component: oc30
+ contrail_repo_pin_priority: 200
linux:
system:
repo:
@@ -8,3 +9,6 @@
source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ ${_param:linux_system_codename} extra ${_param:linux_repo_contrail_component}"
architectures: amd64
key_url: "http://apt.tcpcloud.eu/public.gpg"
+ - pin: 'release c=oc30'
+ priority: ${_param:contrail_repo_pin_priority}
+ package: '*'
diff --git a/linux/system/repo/mos9.yml b/linux/system/repo/mos9.yml
index 9bc7c8c..3a3abe1 100644
--- a/linux/system/repo/mos9.yml
+++ b/linux/system/repo/mos9.yml
@@ -6,15 +6,27 @@
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0'
+# priority: 1100
+# package: '*'
mirantis_openstack_hotfix:
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0-hotfix main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0-hotfix'
+# priority: 1100
+# package: '*'
mirantis_openstack_security:
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0-security main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0-security'
+# priority: 1100
+# package: '*'
mirantis_openstack_updates:
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0-updates main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0-updates'
+# priority: 1100
+# package: '*'
diff --git a/linux/system/repo_local/contrail.yml b/linux/system/repo_local/contrail.yml
index c78e68c..902c4d5 100644
--- a/linux/system/repo_local/contrail.yml
+++ b/linux/system/repo_local/contrail.yml
@@ -8,6 +8,6 @@
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/contrail trusty main"
pin:
- - pin: 'release l=Local Contrail APT repository'
+ - pin: 'release l=contrail ubuntu-trusty'
priority: ${_param:contrail_repo_pin_priority}
package: '*'
diff --git a/linux/system/repo_local/mos8.yml b/linux/system/repo_local/mos8.yml
index 29c6636..ddefdb7 100644
--- a/linux/system/repo_local/mos8.yml
+++ b/linux/system/repo_local/mos8.yml
@@ -7,7 +7,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0'
+ - pin: 'release a=mos8.0'
priority: 1100
package: '*'
#mos8_openstack_hotfix:
@@ -15,7 +15,7 @@
# architectures: amd64
# key_url: "http://${_param:local_repo_url}/public.gpg"
# pin:
- # - pin: 'release s=mos8.0-hotfix'
+ # - pin: 'release a=mos8.0-hotfix'
# priority: 1100
# package: '*'
mos8_openstack_proposed:
@@ -23,7 +23,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-proposed'
+ - pin: 'release a=mos8.0-proposed'
priority: 1100
package: '*'
#mos8_openstack_security:
@@ -31,7 +31,7 @@
# architectures: amd64
# key_url: "http://${_param:local_repo_url}/public.gpg"
# pin:
- # - pin: 'release s=mos8.0-security'
+ # - pin: 'release a=mos8.0-security'
# priority: 1100
# package: '*'
mos8_openstack_updates:
@@ -39,7 +39,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-updates'
+ - pin: 'release a=mos8.0-updates'
priority: 1100
package: '*'
#mos8_murano:
@@ -48,6 +48,6 @@
# architectures: amd64
# key_url: "http://${_param:local_repo_url}/public.gpg"
# pin:
- # - pin: 'release s=mos8.0-proposed'
+ # - pin: 'release a=mos8.0-proposed'
# priority: 1100
- # package: '*'
\ No newline at end of file
+ # package: '*'
diff --git a/linux/system/repo_local/mos9.yml b/linux/system/repo_local/mos9.yml
index 6886185..5b6cdac 100644
--- a/linux/system/repo_local/mos9.yml
+++ b/linux/system/repo_local/mos9.yml
@@ -7,7 +7,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0'
+ - pin: 'release a=mos9.0'
priority: 1100
package: '*'
mos9_openstack_hotfix:
@@ -15,7 +15,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-hotfix'
+ - pin: 'release a=mos9.0-hotfix'
priority: 1100
package: '*'
mos9_openstack_proposed:
@@ -23,7 +23,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-proposed'
+ - pin: 'release a=mos9.0-proposed'
priority: 1100
package: '*'
mos9_openstack_security:
@@ -31,7 +31,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-security'
+ - pin: 'release a=mos9.0-security'
priority: 1100
package: '*'
mos9_openstack_updates:
@@ -39,7 +39,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-updates'
+ - pin: 'release a=mos9.0-updates'
priority: 1100
package: '*'
mos9_murano:
@@ -48,6 +48,6 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-proposed'
+ - pin: 'release a=mos8.0-proposed'
priority: 1100
package: '*'
diff --git a/linux/system/repo_local/openstack.yml b/linux/system/repo_local/openstack.yml
index 4754d12..a873afb 100644
--- a/linux/system/repo_local/openstack.yml
+++ b/linux/system/repo_local/openstack.yml
@@ -10,7 +10,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0'
+ - pin: 'release a=mos8.0'
priority: 1000
package: '*'
mirantis_openstack_hotfix:
@@ -19,7 +19,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-hotfix'
+ - pin: 'release a=mos8.0-hotfix'
priority: 1000
package: '*'
mirantis_openstack_proposed:
@@ -28,7 +28,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-proposed'
+ - pin: 'release a=mos8.0-proposed'
priority: 1000
package: '*'
mirantis_openstack_security:
@@ -37,7 +37,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-security'
+ - pin: 'release a=mos8.0-security'
priority: 1000
package: '*'
mirantis_openstack_updates:
@@ -46,6 +46,6 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-updates'
+ - pin: 'release a=mos8.0-updates'
priority: 1000
package: '*'