ec2_instance: ebs_optimized is not sub-option of 'network'

[Shaps]

SUMMARY

Updated ec2_instance to look for ebs_optimized as top level option instead of sub-option of network.
Fixes #48159

ISSUE TYPE

• Bugfix Pull Request

COMPONENT NAME

ec2_instance.py

ANSIBLE VERSION

ansible 2.8.0.dev0 (ec2_instance_ebs_optimized_fix 4f4595fc4b) last updated 2018/11/08 11:05:55 (GMT +100)
  config file = /home/shaps/.ansible.cfg
  configured module search path = [u'/home/shaps/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
  ansible python module location = /home/shaps/Documents/code/ansible/lib/ansible
  executable location = /home/shaps/Documents/code/ansible/bin/ansible
  python version = 2.7.15 (default, Oct 15 2018, 15:26:09) [GCC 8.2.1 20180801 (Red Hat 8.2.1-2)]

ADDITIONAL INFORMATION

N/A

[ansibot]

Hi @Shaps, thank you for submitting this pull-request!

click here for bot help

[ansibot]

@Shaps, just so you are aware we have a dedicated Working Group for aws.
You can find other people interested in this in #ansible-aws on Freenode IRC
For more information about communities, meetings and agendas see https://github.com/ansible/community

click here for bot help

[dennisconrad]

@Shaps Thanks for the PR! May I suggest keeping compatibility with the workaround described in #48159 like this?

    if params.get('ebs_optimized') is not None:
        spec['EbsOptimized'] = params.get('ebs_optimized')
    elif (params.get('network') or {}).get('ebs_optimized') is not None:
        # Keep this for compatibility with workaround described in https://github.com/ansible/ansible/issues/48159
        spec['EbsOptimized'] = params['network'].get('ebs_optimized')

[Shaps]

@dennisconrad Yep, good idea. Added the backward compatible check.

[ansibot]

The test ansible-test sanity --test pylint [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_instance.py:1604:12: ansible-deprecated-no-version Display.deprecated call without a version

The test ansible-test sanity --test pep8 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_instance.py:1605:28: E128 continuation line under-indented for visual indent
lib/ansible/modules/cloud/amazon/ec2_instance.py:1655:11: E111 indentation is not a multiple of four

The test ansible-test sanity --test yamllint [explain] failed with 1 error:

test/integration/targets/ec2_instance/playbooks/roles/ec2_instance/tasks/ebs_optimized.yml:40:1: empty-lines too many blank lines (4 > 0)

click here for bot help