[salt-cloud] Add merging ability to profile/provider extensions

This is duplicated from salt-cloud issue here: https://github.com/saltstack/salt-cloud/issues/908

When one profile extends another - only the applied profiles grains will be added to the instance, rather than merging the grains.

For example:

ubuntu_13.10_az_1:
  provider: ec2-ap-southeast-2
  image: ami-XXXXXXXX
  ssh_username: ubuntu
  location: ap-southeast-2
  availability_zone: ap-southeast-2a
  subnetid: subnet-XXXXXXXX
  script: /srv/salt/infrastructure-profiles/platform.sh
  minion:
    master: X.X.X.X
  grains:
    location: ap-southeast-2a

and

AIO_zk_1_profile:
  size: m3.xlarge
  grains:
    aio_role: zookeeper
  extends: ubuntu_13.10_az_1

Then invoking # salt-call grains.items | grep location on the new instance will not return anything.

Checking for the grain from the sub-node will return the correct value:

# salt-call grains.items | grep aio_role
  aio_role: zookeeper

[SJern]

Hi @techhat, exactly which commit fixed this? I’m currently on salt-master 2017.7.0, but the grains still do not seem to merge.

[techhat]

This was fixed a while ago… configuration is merged from main cloud config into providers, then profiles (including grains).