From f6c08adeb3ec6af94fc75eb4e8f0853ce5f38c97 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Fri, 19 Apr 2019 09:16:26 -0400 Subject: Update package type name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - split log output: prepare-env and exec-cmd - fix proxy support when not provided Change-Id: I40cdf90e7e3ebe31b0152923f8b6a38f6b6e9ca0 Issue-ID: CCCSDK-125 Signed-off-by: Alexis de Talhouët --- .../src/main/python/command_executor_handler.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'ms/command-executor/src/main/python/command_executor_handler.py') diff --git a/ms/command-executor/src/main/python/command_executor_handler.py b/ms/command-executor/src/main/python/command_executor_handler.py index 248e44308..9eb36fb2d 100644 --- a/ms/command-executor/src/main/python/command_executor_handler.py +++ b/ms/command-executor/src/main/python/command_executor_handler.py @@ -47,11 +47,11 @@ class CommandExecutorHandler(): return False f = open(self.installed, "w+") - if not self.install_packages(request, CommandExecutor_pb2.PYTHON, f, results): + if not self.install_packages(request, CommandExecutor_pb2.pip, f, results): return False f.write("\r\n") results.append("\n") - if not self.install_packages(request, CommandExecutor_pb2.ANSIBLE, f, results): + if not self.install_packages(request, CommandExecutor_pb2.ansible_galaxy, f, results): return False f.close() else: @@ -63,8 +63,8 @@ class CommandExecutorHandler(): return True def execute_command(self, request, results): - if not self.activate_venv(): - return False + # if not self.activate_venv(): + # return False try: results.append(os.popen(request.command).read()) @@ -82,7 +82,7 @@ class CommandExecutorHandler(): f.write("Installed %s packages:\r\n" % CommandExecutor_pb2.PackageType.Name(type)) for python_package in package.package: f.write(" %s\r\n" % python_package) - if package.type == CommandExecutor_pb2.PYTHON: + if package.type == CommandExecutor_pb2.pip: success = self.install_python_packages(python_package, results) else: success = self.install_ansible_packages(python_package, results) @@ -98,7 +98,8 @@ class CommandExecutorHandler(): command = ["pip", "install", package] env = dict(os.environ) - env['https_proxy'] = os.environ['https_proxy'] + if "https_proxy" in os.environ: + env['https_proxy'] = os.environ['https_proxy'] try: results.append(subprocess.run(command, check=True, stdout=PIPE, stderr=PIPE, env=env).stdout.decode()) @@ -111,11 +112,12 @@ class CommandExecutorHandler(): def install_ansible_packages(self, package, results): self.logger.info( "{} - Install Ansible Role package({}) in Python Virtual Environment".format(self.blueprint_id, package)) - command = ["ansible-galaxy", "install", package, "-p", "Scripts/ansible/roles"] + command = ["ansible-galaxy", "install", package, "-p", self.venv_home + "/Scripts/ansible/roles"] env = dict(os.environ) - # ansible galaxy uses https_proxy environment variable, but requires it to be set with http proxy value. - env['https_proxy'] = os.environ['http_proxy'] + if "http_proxy" in os.environ: + # ansible galaxy uses https_proxy environment variable, but requires it to be set with http proxy value. + env['https_proxy'] = os.environ['http_proxy'] try: results.append(subprocess.run(command, check=True, stdout=PIPE, stderr=PIPE, env=env).stdout.decode()) -- cgit 1.2.3-korg