export KUBE_USER to salt (support custom usernames) for vagrant, vsphere, photon, openstack.

This commit is contained in:
CJ Cullen 2016-07-22 15:21:47 -07:00
parent f55206a675
commit 861583ac3e
4 changed files with 4 additions and 0 deletions

View File

@ -24,6 +24,7 @@ write_files:
docker_opts: ""
master_extra_sans: "DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local,DNS:kubernetes-master"
keep_host_etcd: true
kube_user: $KUBE_USER
- path: /srv/kubernetes/openstack.conf
content: |
[Global]

View File

@ -29,6 +29,7 @@ grains:
cloud: photon-controller
master_extra_sans: $MASTER_EXTRA_SANS
api_servers: $MASTER_NAME
kube_user: $KUBE_USER
EOF
# Auto accept all keys from minions that try to join

View File

@ -90,6 +90,7 @@ grains:
docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'
master_extra_sans: '$(echo "$MASTER_EXTRA_SANS" | sed -e "s/'/''/g")'
keep_host_etcd: true
kube_user: '$(echo "$KUBE_USER" | sed -e "s/'/''/g")'
EOF
}

View File

@ -28,6 +28,7 @@ grains:
cbr-cidr: $MASTER_IP_RANGE
cloud: vsphere
master_extra_sans: $MASTER_EXTRA_SANS
kube_user: $KUBE_USER
EOF
# Auto accept all keys from minions that try to join