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

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


The following commit(s) were added to refs/heads/DLAB-515 by this push:
     new 3df3619  [DLAB-515]: fixed issue with Ubuntu version change
3df3619 is described below

commit 3df36192b4d3f2af0a10c35af48ccc02f76bc04d
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 25 11:31:40 2020 +0200

    [DLAB-515]: fixed issue with Ubuntu version change
---
 infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 2 +-
 infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py   | 4 ++--
 infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 2ca635d..0db35ed 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -58,7 +58,7 @@ def manage_pkg(command, environment, requisites):
         sys.exit(1)
 
 def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
-                                'groff gcc vim less git wget sysv-rc-conf '
+                                'groff gcc vim less git wget '
                                 'libssl-dev unattended-upgrades nmap '
                                 'libffi-dev unzip libxml2-dev haveged'):
     try:
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py 
b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index 582d58e..06ba99a 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -51,8 +51,8 @@ def configure_http_proxy_server(config):
             for cidr in config['allowed_ip_cidr']:
                 replace_string += 'acl AllowedCIDRS src {}\\n'.format(cidr)
             sudo('sed -i "s|ALLOWED_CIDRS|{}|g" 
/etc/squid/squid.conf'.format(replace_string))
-            sudo('service squid reload')
-            sudo('sysv-rc-conf squid on')
+            sudo('systemctl reload squid')
+            sudo('systemctl enable squid')
             sudo('touch /tmp/http_proxy_ensured')
     except Exception as err:
         print("Failed to install and configure squid: " + str(err))
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py 
b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index bb073c3..e5c8825 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -91,8 +91,8 @@ def configure_jenkins(dlab_path, os_user, config, 
tag_resource_id):
             sudo("find /var/lib/jenkins/jobs/ -type f | xargs sed -i 
\'s/OS_USR/{}/g; s/SBN/{}/g; s/CTUN/{}/g; s/SGI/{}/g; s/VPC/{}/g; s/SNI/{}/g; 
s/AKEY/{}/g\'".format(os_user, config['service_base_name'], tag_resource_id, 
config['security_group_id'], config['vpc_id'], config['subnet_id'], 
config['admin_key']))
             sudo('chown -R jenkins:jenkins /var/lib/jenkins')
             sudo('/etc/init.d/jenkins stop; sleep 5')
-            sudo('sysv-rc-conf jenkins on')
-            sudo('service jenkins start')
+            sudo('systemctl enable jenkins')
+            sudo('systemctl start jenkins')
             sudo('touch ' + dlab_path + '/tmp/jenkins_configured')
             sudo('echo "jenkins ALL = NOPASSWD:ALL" >> /etc/sudoers')
     except Exception as err:


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to