diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-09-15 12:42:50 +0200 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-09-15 11:48:27 +0000 |
| commit | 6aaeb3237653102b5a376986f0ea73327a7a4379 (patch) | |
| tree | 6c6acf3151ea39557db106a1202a7763aef8a530 /azurelinuxagent/ga/env.py | |
| parent | 185ceb32fea5d5c2a43d7b6ee2a40228489055f4 (diff) | |
| download | vyos-walinuxagent-6aaeb3237653102b5a376986f0ea73327a7a4379.tar.gz vyos-walinuxagent-6aaeb3237653102b5a376986f0ea73327a7a4379.zip | |
Import patches-unapplied version 2.2.17-0ubuntu1 to ubuntu/artful-proposed
Imported using git-ubuntu import.
Changelog parent: 185ceb32fea5d5c2a43d7b6ee2a40228489055f4
New changelog entries:
* New upstream release (LP: #1717306).
Diffstat (limited to 'azurelinuxagent/ga/env.py')
| -rw-r--r-- | azurelinuxagent/ga/env.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/azurelinuxagent/ga/env.py b/azurelinuxagent/ga/env.py index 0456cb0..45b10bb 100644 --- a/azurelinuxagent/ga/env.py +++ b/azurelinuxagent/ga/env.py @@ -76,17 +76,20 @@ class EnvHandler(object): while not self.stopped: self.osutil.remove_rules_files() - if conf.enable_firewall(): - success = self.osutil.enable_firewall( - dst_ip=protocol.endpoint, - uid=os.getuid()) - add_periodic( - logger.EVERY_HOUR, - AGENT_NAME, - version=CURRENT_VERSION, - op=WALAEventOperation.Firewall, - is_success=success, - log_event=True) + # Disable setting firewall for now, regardless of configuration switch + # if conf.enable_firewall(): + # success = self.osutil.enable_firewall( + # dst_ip=protocol.endpoint, + # uid=os.getuid()) + # add_periodic( + # logger.EVERY_HOUR, + # AGENT_NAME, + # version=CURRENT_VERSION, + # op=WALAEventOperation.Firewall, + # is_success=success, + # log_event=True) + + self.osutil.remove_firewall() timeout = conf.get_root_device_scsi_timeout() if timeout is not None: |