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

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


The following commit(s) were added to refs/heads/v2.1-RC2 by this push:
     new c4e218a  [DLAB-535] Fixed instance creation issue due to missing -y 
flag and added condition to install linux-aws-hwe only on AWS
     new 81c3180  Merge pull request #56 from Dyoma33/DLAB-535-RC
c4e218a is described below

commit c4e218afa459fe7b07f6a2fd2cb63ef62dc4c7e3
Author: Dyoma33 <[email protected]>
AuthorDate: Mon Mar 25 14:40:04 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 76166c7..2bc7b9b 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 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to