summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2019-09-11 21:09:34 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-09-11 21:09:34 +0000
commite7f16e215ef4fd6a31ddd2f1b585bbb6508bff06 (patch)
treeba9a0e07a3ac8ca996c8071b77dec2fd64ec738c /cloudinit
parent45426d8d38a7224962867ba71f390cce653e0d17 (diff)
downloadvyos-cloud-init-e7f16e215ef4fd6a31ddd2f1b585bbb6508bff06.tar.gz
vyos-cloud-init-e7f16e215ef4fd6a31ddd2f1b585bbb6508bff06.zip
Brightbox: restrict detection to require full domain match .brightbox.com
The detection for brightbox in both ds-identify and in identify_brightbox would incorrectly match the domain 'bobrightbox', which is not a brightbox platform. The fix here is to restrict matching to '*.brightbox.com' rather than '*brightbox.com' Also, while here remove a url to bug 1661693 which added the knowledge of brightbox.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/sources/DataSourceEc2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index 5c017bfb..10107456 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -473,7 +473,7 @@ def identify_aws(data):
def identify_brightbox(data):
- if data['serial'].endswith('brightbox.com'):
+ if data['serial'].endswith('.brightbox.com'):
return CloudNames.BRIGHTBOX