Skip to content

Disable bouncing hostname when setting hostname fails #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blackboxsw merged 2 commits into from
Jul 22, 2020
Merged

Disable bouncing hostname when setting hostname fails #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810ba78
failing to set hostname should disable bouncing but not fail provisio…
anhvoms Jul 17, 2020
fd32c03
Merge branch 'master' into fixNonCompliantHostname
blackboxsw Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cloudinit/sources/DataSourceAzure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,14 @@ def temporary_hostname(temp_hostname, cfg, hostname_command='hostname'):
(previous_hostname == temp_hostname and policy != 'force')):
yield None
return
set_hostname(temp_hostname, hostname_command)
try:
set_hostname(temp_hostname, hostname_command)
except Exception as e:
msg = 'Failed setting temporary hostname: %s' % e
report_diagnostic_event(msg)
LOG.warning(msg)
yield None
return
try:
yield previous_hostname
finally:
Expand Down
11 changes: 11 additions & 0 deletions tests/unittests/test_datasource/test_azure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,17 @@ def test_set_hostname_option_can_disable_hostname_set(self):

self.assertEqual(0, self.set_hostname.call_count)

@mock.patch(MOCKPATH + 'perform_hostname_bounce')
def test_set_hostname_failed_disable_bounce(
self, perform_hostname_bounce):
cfg = {'set_hostname': True, 'hostname_bounce': {'policy': 'force'}}
self.get_hostname.return_value = "old-hostname"
self.set_hostname.side_effect = Exception
data = self.get_ovf_env_with_dscfg('some-hostname', cfg)
self._get_ds(data).get_data()

self.assertEqual(0, perform_hostname_bounce.call_count)


class TestLoadAzureDsDir(CiTestCase):
"""Tests for load_azure_ds_dir."""
Expand Down