From c4208bb66155b0aeea8fae50af5dea5e4fb95ab2 Mon Sep 17 00:00:00 2001 From: John Galt Date: Thu, 31 Mar 2016 19:39:55 -0700 Subject: [PATCH] Renamed "provider" to "driver" --- salt/files/cloud.providers.d/ec2.conf | 2 +- salt/files/cloud.providers.d/gce.conf | 2 +- salt/files/cloud.providers.d/rsos.conf | 2 +- salt/files/cloud.providers.d/saltify.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/files/cloud.providers.d/ec2.conf b/salt/files/cloud.providers.d/ec2.conf index 990a476..003fa5b 100644 --- a/salt/files/cloud.providers.d/ec2.conf +++ b/salt/files/cloud.providers.d/ec2.conf @@ -15,5 +15,5 @@ ec2_ubuntu_public: location: eu-west-1 availability_zone: eu-west-1a ssh_username: ubuntu - provider: ec2 + driver: ec2 {%- endif %} diff --git a/salt/files/cloud.providers.d/gce.conf b/salt/files/cloud.providers.d/gce.conf index 4a8d762..5a409e8 100644 --- a/salt/files/cloud.providers.d/gce.conf +++ b/salt/files/cloud.providers.d/gce.conf @@ -10,5 +10,5 @@ gce: master: {{ cloud.get('master', 'salt') }} grains: test: True - provider: gce + driver: gce {%- endif %} diff --git a/salt/files/cloud.providers.d/rsos.conf b/salt/files/cloud.providers.d/rsos.conf index 4bd41f1..801717d 100644 --- a/salt/files/cloud.providers.d/rsos.conf +++ b/salt/files/cloud.providers.d/rsos.conf @@ -14,7 +14,7 @@ rsos_{{ region|lower }}: compute_name: cloudServersOpenStack protocol: ipv4 compute_region: {{ region }} - provider: openstack + driver: openstack user: {{ cloud.get('rsos_user', 'DEFAULT') }} tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }} apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }} diff --git a/salt/files/cloud.providers.d/saltify.conf b/salt/files/cloud.providers.d/saltify.conf index 97cc2d5..23e4dae 100644 --- a/salt/files/cloud.providers.d/saltify.conf +++ b/salt/files/cloud.providers.d/saltify.conf @@ -3,6 +3,6 @@ {% set cloud = salt['pillar.get']('salt:cloud', {}) -%} saltify: - provider: saltify + driver: saltify minion: master: {{ cloud.get('master', 'salt') }}