diff options
author | Scott Moser <smoser@brickies.net> | 2017-02-24 14:19:20 -0500 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2017-02-24 22:51:25 -0500 |
commit | 5dd5b2cb539a84ed59f2b3181020d2bd18989718 (patch) | |
tree | 0f538182ea897e7eb05f18812c76be29776220c6 | |
parent | 9bb55c6c45bcc5e310cf7e4d42cad53759dcca15 (diff) | |
download | vyos-cloud-init-5dd5b2cb539a84ed59f2b3181020d2bd18989718.tar.gz vyos-cloud-init-5dd5b2cb539a84ed59f2b3181020d2bd18989718.zip |
Identify Brightbox as an Ec2 datasource user.
Brightbox will identify their platform to the guest by setting the
product serial to a string that ends with 'brightbox.com'.
LP: #1661693
-rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 8 | ||||
-rwxr-xr-x | tools/ds-identify | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 26da263a..c7df8060 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -30,6 +30,7 @@ STRICT_ID_DEFAULT = "warn" class Platforms(object): ALIYUN = "AliYun" AWS = "AWS" + BRIGHTBOX = "Brightbox" SEEDED = "Seeded" UNKNOWN = "Unknown" @@ -325,10 +326,15 @@ def identify_aws(data): return None +def identify_brightbox(data): + if data['serial'].endswith('brightbox.com'): + return Platforms.BRIGHTBOX + + def identify_platform(): # identify the platform and return an entry in Platforms. data = _collect_platform_data() - checks = (identify_aws, lambda x: Platforms.UNKNOWN) + checks = (identify_aws, identify_brightbox, lambda x: Platforms.UNKNOWN) for checker in checks: try: result = checker(data) diff --git a/tools/ds-identify b/tools/ds-identify index dfa856ff..c39956fc 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -639,6 +639,11 @@ ec2_identify_platform() { local default="$1" local serial="${DI_DMI_PRODUCT_SERIAL}" + # brightbox https://bugs.launchpad.net/cloud-init/+bug/1661693 + case "$serial" in + *brightbox.com) _RET="Brightbox"; return 0;; + esac + # AWS http://docs.aws.amazon.com/AWSEC2/ # latest/UserGuide/identify_ec2_instances.html local uuid="" hvuuid="$PATH_ROOT/sys/hypervisor/uuid" |