openstack
/
magnum
Code Issues Proposed changes

Merge "Revert "Remove KUBE_API_PUBLIC_ADDRESS""

This commit is contained in:
Jenkins 2016-05-10 19:12:01 +00:00 committed by Gerrit Code Review
parent 851044ed66 4ffe3c9912
commit 3cbc3b9b44
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/templates/kubernetes/fragments/make-cert.sh
View File

@ -25,7 +25,7 @@ if [ "$TLS_DISABLED" == "True" ]; then
fi
cert_ip=$(curl -s http://169.254.169.254/latest/meta-data/public-ipv4)
sans="IP:${cert_ip},IP:${KUBE_API_PRIVATE_ADDRESS},IP:127.0.0.1"
sans="IP:${cert_ip},IP:${KUBE_API_PUBLIC_ADDRESS},IP:${KUBE_API_PRIVATE_ADDRESS},IP:127.0.0.1"
MASTER_HOSTNAME=${MASTER_HOSTNAME:-}
if [[ -n "${MASTER_HOSTNAME}" ]]; then
sans="${sans},DNS:${MASTER_HOSTNAME}"

1
magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
View File

@ -5,6 +5,7 @@ write_files:
owner: "root:root"
permissions: "0644"
content: |
KUBE_API_PUBLIC_ADDRESS="$KUBE_API_PUBLIC_ADDRESS"
KUBE_API_PRIVATE_ADDRESS="$KUBE_API_PRIVATE_ADDRESS"
KUBE_API_PORT="$KUBE_API_PORT"
KUBE_NODE_IP="$KUBE_NODE_IP"

1
magnum/templates/kubernetes/kubemaster.yaml
View File

@ -196,6 +196,7 @@ resources:
str_replace:
template: {get_file: fragments/write-heat-params-master.yaml}
params:
"$KUBE_API_PUBLIC_ADDRESS": {get_param: api_public_address}
"$KUBE_API_PRIVATE_ADDRESS": {get_param: api_private_address}
"$KUBE_API_PORT": {get_param: kubernetes_port}
"$KUBE_NODE_IP": {get_attr: [kube_master_eth0, fixed_ips, 0, ip_address]}