diff --git a/share/oneprovision/hybrid+/provisions/aws.yml b/share/oneprovision/hybrid+/provisions/aws.yml index b8cb76de94..4cd9c3c1b9 100644 --- a/share/oneprovision/hybrid+/provisions/aws.yml +++ b/share/oneprovision/hybrid+/provisions/aws.yml @@ -22,6 +22,7 @@ name: 'aws-cluster' provision_type: 'hybrid+' +provider: 'aws' image: 'OPENNEBULA-AWS.png' @@ -53,7 +54,7 @@ playbook: #-------------------------------------------------------------------------------- defaults: provision: - provider: 'aws' + provider_name: 'aws' ami: "${input.aws_ami_image}" instancetype: "${input.aws_instance_type}" cloud_init: true diff --git a/share/oneprovision/hybrid+/provisions/packet.yml b/share/oneprovision/hybrid+/provisions/packet.yml index da73cb150a..ed3b8a8117 100644 --- a/share/oneprovision/hybrid+/provisions/packet.yml +++ b/share/oneprovision/hybrid+/provisions/packet.yml @@ -22,6 +22,7 @@ name: 'packet-cluster' provision_type: 'hybrid+' +provider: 'packet' image: 'OPENNEBULA-EQUINIX.png' @@ -53,7 +54,7 @@ playbook: #-------------------------------------------------------------------------------- defaults: provision: - provider: 'packet' + provider_name: 'packet' plan: "${input.packet_plan}" os: "${input.packet_os}" diff --git a/src/oneprovision/lib/provision/provision.rb b/src/oneprovision/lib/provision/provision.rb index c31c013e54..8845f50414 100644 --- a/src/oneprovision/lib/provision/provision.rb +++ b/src/oneprovision/lib/provision/provision.rb @@ -479,11 +479,11 @@ module OneProvision # Provider can be set in provision defaults or in hosts # it's the same for all hosts, taking the first one is enough if template['defaults'] && template['defaults/provision'] - provider = template['defaults/provision/provider'] + provider = template['defaults/provision/provider_name'] end if !provider && template['hosts'][0]['provision'] - provider = template['hosts'][0]['provision']['provider'] + provider = template['hosts'][0]['provision']['provider_name'] end provider