You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/03/25 12:45:56 UTC

[incubator-dlab] branch develop updated: [DLAB-535] Fixed instance creation issue due to missing -y flag and added condition to install linux-aws-hwe only on AWS

This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 95fdf7b  [DLAB-535] Fixed instance creation issue due to missing -y flag and added condition to install linux-aws-hwe only on AWS
     new 2d83485  Merge pull request #57 from Dyoma33/DLAB-535-dev
95fdf7b is described below

commit 95fdf7b35d8cee38629dc1084b42298082a7574a
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Mon Mar 25 14:42:27 2019 +0200

    [DLAB-535] Fixed instance creation issue due to missing -y flag and added condition to install linux-aws-hwe only on AWS
---
 infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index 163ebba..5b004a0 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -24,6 +24,7 @@
 from fabric.api import *
 from fabric.contrib.files import exists
 import sys
+import os
 
 
 def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
@@ -41,7 +42,8 @@ def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
             sudo('touch /home/{}/.ensure_dir/pkg_upgraded'.format(user))
             sudo('systemctl enable haveged')
             sudo('systemctl start haveged')
-            sudo('apt-get -y install --install-recommends linux-aws-hwe')
+            if os.environ['conf_cloud_provider'] == 'aws':
+                sudo('apt-get -y install --install-recommends linux-aws-hwe')
     except:
         sys.exit(1)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org