move vagrant to masterless salt
This commit is contained in:
@@ -9,7 +9,9 @@
|
||||
{% set cloud_config_volume = "" -%}
|
||||
|
||||
{% if grains.cloud is defined -%}
|
||||
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
|
||||
{% if grains.cloud != 'vagrant' -%}
|
||||
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
|
||||
{% endif -%}
|
||||
|
||||
{% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
|
||||
{% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
|
||||
|
||||
@@ -27,7 +27,9 @@
|
||||
{% set cloud_config_volume = "" -%}
|
||||
|
||||
{% if grains.cloud is defined -%}
|
||||
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
|
||||
{% if grains.cloud != 'vagrant' -%}
|
||||
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
|
||||
{% endif -%}
|
||||
{% set service_account_key = " --service-account-private-key-file=/srv/kubernetes/server.key " -%}
|
||||
|
||||
{% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/etc/kubernetes/kube-node-unpacker.sh:
|
||||
file.managed:
|
||||
- source: salt://kube-node-unpacker/kube-node-unpacker.sh
|
||||
- makedirs: True
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 755
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
{% endif -%}
|
||||
|
||||
{% set cloud_provider = "" -%}
|
||||
{% if grains.cloud is defined -%}
|
||||
{% if grains.cloud is defined and grains.cloud != 'vagrant' -%}
|
||||
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
|
||||
{% endif -%}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user