diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-20 11:43:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 11:43:10 -0500 |
| commit | d5a464bddf793e64a2c3937f61b109e0f801e6b5 (patch) | |
| tree | fe0d38683318b27576040da7e7c58c15e346fee2 /roles | |
| parent | e692d7d757742f82dc6ba554110c78a0d0ccbcf6 (diff) | |
| parent | 1e167b9f136bb8ebcb684e1956f4b42a29a95356 (diff) | |
| download | openshift-d5a464bddf793e64a2c3937f61b109e0f801e6b5.tar.gz openshift-d5a464bddf793e64a2c3937f61b109e0f801e6b5.tar.bz2 openshift-d5a464bddf793e64a2c3937f61b109e0f801e6b5.tar.xz openshift-d5a464bddf793e64a2c3937f61b109e0f801e6b5.zip | |
Merge pull request #6792 from mtnbikenc/fix-1533099
[1533099] Add support for Amazon EC2 C5 instance types
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index d7c358a2f..26f0525e9 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1465,6 +1465,11 @@ class OpenShiftFacts(object): if metadata: metadata['project']['attributes'].pop('sshKeys', None) metadata['instance'].pop('serviceAccounts', None) + elif bios_vendor == 'Amazon EC2': + # Adds support for Amazon EC2 C5 instance types + provider = 'aws' + metadata_url = 'http://169.254.169.254/latest/meta-data/' + metadata = get_provider_metadata(metadata_url) elif virt_type == 'xen' and virt_role == 'guest' and re.match(r'.*\.amazon$', product_version): provider = 'aws' metadata_url = 'http://169.254.169.254/latest/meta-data/' |