diff --git a/ChangeLog b/ChangeLog index 62d9d73be56c13cf2c64068e496d245a4135a940..92c5c4fa4a06afbc5435f70dbb5745d1874e486e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-10-21, v0.7.3 + * Instruct kamaki to ignore the ssl certificates (kamaki >= 0.13rc5). + 2014-10-14, v0.7.2 * Fix an exception triggered when collecting Ubuntu metadata diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py index 4f548a04661c1cf3c5e9c9ff0a9d0257ced0122d..38950ae0ba4b89cab9b9a4b95c6d753061e34f26 100644 --- a/image_creator/kamaki_wrapper.py +++ b/image_creator/kamaki_wrapper.py @@ -30,6 +30,12 @@ from kamaki.clients.image import ImageClient from kamaki.clients.pithos import PithosClient from kamaki.clients.astakos import CachedAstakosClient as AstakosClient +try: + from kamaki.clients.utils import https + https.patch_ignore_ssl() +except ImportError: + pass + try: config = Config() except Exception as e: diff --git a/image_creator/version.py b/image_creator/version.py index fbbd6d62bee9a3f4af96c7a2ece44963defa6a83..be97e54bc7d84fc143fcc7b23ecc0b0bc4274aa1 100644 --- a/image_creator/version.py +++ b/image_creator/version.py @@ -1,8 +1,8 @@ -__version__ = "0.7.2" +__version__ = "0.7.3" __version_vcs_info__ = { - 'branch': 'hotfix-0.7.2', - 'revid': '7b0713f', - 'revno': 582} + 'branch': 'hotfix-0.7.3', + 'revid': '5de748e', + 'revno': 586} __version_user_email__ = "skalkoto@grnet.gr" __version_user_name__ = "Nikos Skalkotos" diff --git a/version b/version index 7486fdbc50b3f93d9d04db440483984df5d1dcce..f38fc5393ff66e64aaa5d8733ea9b44d31927dce 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.7.2 +0.7.3