shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00
Code Releases Wiki Activity

M #~: Add provider name tag (#623)

Browse Source
This commit is contained in:
Sergio Betanzos 2021-01-12 13:48:22 +01:00 committed by GitHub
parent b4f0324000
commit da519d197d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/oneprovision/hybrid+/provisions/aws.yml
View File

@ -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

3
share/oneprovision/hybrid+/provisions/packet.yml
View File

@ -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}"

4
src/oneprovision/lib/provision/provision.rb
View File

@ -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