saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #215 from centromere/provider-fix

Browse Source 
Renamed "provider" to "driver"
This commit is contained in:
Nitin Madhok 2016-03-31 22:48:17 -04:00
commit 29d4a55828
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/cloud.providers.d/ec2.conf
View File

@ -15,5 +15,5 @@ ec2_ubuntu_public:
location: eu-west-1 location: eu-west-1
availability_zone: eu-west-1a availability_zone: eu-west-1a
ssh_username: ubuntu ssh_username: ubuntu
provider: ec2 driver: ec2
{%- endif %} {%- endif %}

2
salt/files/cloud.providers.d/gce.conf
View File

@ -10,5 +10,5 @@ gce:
master: {{ cloud.get('master', 'salt') }} master: {{ cloud.get('master', 'salt') }}
grains: grains:
test: True test: True
provider: gce driver: gce
{%- endif %} {%- endif %}

2
salt/files/cloud.providers.d/rsos.conf
View File

@ -14,7 +14,7 @@ rsos_{{ region|lower }}:
compute_name: cloudServersOpenStack compute_name: cloudServersOpenStack
protocol: ipv4 protocol: ipv4
compute_region: {{ region }} compute_region: {{ region }}
provider: openstack driver: openstack
user: {{ cloud.get('rsos_user', 'DEFAULT') }} user: {{ cloud.get('rsos_user', 'DEFAULT') }}
tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }} tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }}
apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }} apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }}

2
salt/files/cloud.providers.d/saltify.conf
View File

@ -3,6 +3,6 @@
{% set cloud = salt['pillar.get']('salt:cloud', {}) -%} {% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
saltify: saltify:
provider: saltify driver: saltify
minion: minion:
master: {{ cloud.get('master', 'salt') }} master: {{ cloud.get('master', 'salt') }}