From bac58ab49b72337beea54141ecffc9f9e9d32ca9 Mon Sep 17 00:00:00 2001 From: "Jay Lau (Guangya Liu)" Date: Wed, 31 Dec 2014 07:07:11 -0500 Subject: [PATCH] Enable pod update using pod_defintion_url Change-Id: I6d24d144e33898b8b2038034ca3f7cb44dc54e9d --- magnum/conductor/handlers/common/kube_utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/magnum/conductor/handlers/common/kube_utils.py b/magnum/conductor/handlers/common/kube_utils.py index 2af6dc4580..f3abb1a550 100644 --- a/magnum/conductor/handlers/common/kube_utils.py +++ b/magnum/conductor/handlers/common/kube_utils.py @@ -115,7 +115,13 @@ class KubeClient(object): def pod_update(contents): LOG.debug("pod_update contents %s" % contents) try: - out, err = utils.trycmd('kubectl', 'update', '-f', contents) + if contents.pod_definition_url: + out, err = utils.trycmd('kubectl', 'update', '-f', + contents.pod_definition_url) + else: + # TODO(jay-lau-513) Translate the contents to a json stdin + out, err = utils.trycmd('echo contents | kubectl', 'update', + '-f', '-') if err: return False except Exception as e: