Browse Source

Merge pull request #215 from centromere/provider-fix

Renamed "provider" to "driver"
tags/v0.57.0
Nitin Madhok 8 years ago
parent
commit
29d4a55828
4 changed files with 4 additions and 4 deletions
  1. +1
    -1
      salt/files/cloud.providers.d/ec2.conf
  2. +1
    -1
      salt/files/cloud.providers.d/gce.conf
  3. +1
    -1
      salt/files/cloud.providers.d/rsos.conf
  4. +1
    -1
      salt/files/cloud.providers.d/saltify.conf

+ 1
- 1
salt/files/cloud.providers.d/ec2.conf View File

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 %}

+ 1
- 1
salt/files/cloud.providers.d/gce.conf View File

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

+ 1
- 1
salt/files/cloud.providers.d/rsos.conf View File

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') }}

+ 1
- 1
salt/files/cloud.providers.d/saltify.conf View File

{% 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') }}

Loading…
Cancel
Save