diff options
author | Varac <varac@leap.se> | 2017-06-29 20:36:59 +0200 |
---|---|---|
committer | Varac <varac@leap.se> | 2017-06-29 20:36:59 +0200 |
commit | acf491a42ba2cd48669ae12021f2ecfe9b181ef2 (patch) | |
tree | 4db9579ee9b48fdbfdaeda626021b7148fbfb628 /puppet/modules | |
parent | ef455a41d6529898a2d8848e65e464705729e661 (diff) | |
parent | 03ff5b1d22f4487d97818da3693e9a33ba1421a3 (diff) |
Merge branch 'python_cryptography'
Diffstat (limited to 'puppet/modules')
-rw-r--r-- | puppet/modules/site_apt/manifests/preferences/python_cryptography.pp | 12 | ||||
-rw-r--r-- | puppet/modules/site_mx/manifests/init.pp | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/python_cryptography.pp b/puppet/modules/site_apt/manifests/preferences/python_cryptography.pp new file mode 100644 index 00000000..d725c1af --- /dev/null +++ b/puppet/modules/site_apt/manifests/preferences/python_cryptography.pp @@ -0,0 +1,12 @@ +# Pin python-cryptography to jessie-backports in order to +# satisfy leap-mx dependency (>=17.0) +# see https://0xacab.org/leap/platform/issues/8837 +class site_apt::preferences::python_cryptography { + + apt::preferences_snippet { 'python_cryptography': + package => 'python-cryptography python-openssl python-pyasn1 python-setuptools python-pkg-resources python-cffi', + release => "${::lsbdistcodename}-backports", + priority => 999; + } + +} diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index 5876e555..28a01d4a 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -19,4 +19,6 @@ class site_mx { include ::site_check_mk::agent::mx # install twisted from jessie backports include ::site_apt::preferences::twisted + # install python-cryptography from jessie backports + include ::site_apt::preferences::python_cryptography } |