2
0

Supplied default values for all pillar queries in provider templates.

These aren't intended to function; they're here to allow the use of
file.recurse on the provider folder, without requiring the user
to provide pillar data for templates they're not using.
This commit is contained in:
Andrew Vant 2015-04-03 18:47:08 -04:00
parent fb1d7e8d3b
commit 7e074dc379
4 changed files with 14 additions and 11 deletions

View File

@ -2,12 +2,12 @@
{% set cloud = salt['pillar.get']('salt:cloud', {}) -%} {% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
ec2_ubuntu_public: ec2_ubuntu_public:
minion: minion:
master: {{ cloud['master'] }} master: {{ cloud.get('master', 'salt') }}
grains: grains:
test: True test: True
ssh_interface: public_ips ssh_interface: public_ips
id: {{ cloud['aws_key'] }} id: {{ cloud.get('aws_key', 'DEFAULT') }}
key: '{{ cloud['aws_secret'] }}' key: '{{ cloud.get('aws_secret', 'DEFAULT') }}'
private_key: /etc/salt/cloud.providers.d/key/key.pem private_key: /etc/salt/cloud.providers.d/key/key.pem
keyname: keyname keyname: keyname
location: eu-west-1 location: eu-west-1

View File

@ -1,11 +1,11 @@
# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
{% set cloud = salt['pillar.get']('salt:cloud', {}) -%} {% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
gce: gce:
project: "{{ cloud['gce_project'] }}" project: "{{ cloud.get('gce_project', 'DEFAULT') }}"
service_account_email_address: "{{ cloud['gce_service_account_email_address'] }}" service_account_email_address: "{{ cloud.get('gce_service_account_email_address', 'DEFAULT') }}"
service_account_private_key: "/etc/salt/cloud.providers.d/key.pem" service_account_private_key: "/etc/salt/cloud.providers.d/key.pem"
minion: minion:
master: {{ cloud['master'] }} master: {{ cloud.get('master', 'salt') }}
grains: grains:
test: True test: True
provider: gce provider: gce

View File

@ -6,7 +6,7 @@
rsos_{{ region|lower }}: rsos_{{ region|lower }}:
minion: minion:
master: {{ cloud['master'] }} master: {{ cloud.get('master', 'salt') }}
grains: grains:
region: {{ region|lower }} region: {{ region|lower }}
@ -15,7 +15,7 @@ rsos_{{ region|lower }}:
protocol: ipv4 protocol: ipv4
compute_region: {{ region }} compute_region: {{ region }}
provider: openstack provider: openstack
user: {{ cloud['rsos_user'] }} user: {{ cloud.get('rsos_user', 'DEFAULT') }}
tenant: {{ cloud['rsos_tenant'] }} tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }}
apikey: {{ cloud['rsos_apikey'] }} apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }}
{% endfor %} {% endfor %}

View File

@ -1,5 +1,8 @@
# This file is managed by Salt via {{ source }} # This file is managed by Salt via {{ source }}
{% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
saltify: saltify:
provider: saltify provider: saltify
minion: minion:
master: {{ cloud['master'] }} master: {{ cloud.get('master', 'salt') }}