Skip to content

Commit

Permalink
Merge pull request #361 from Mirantis/fip-ssl
Browse files Browse the repository at this point in the history
Define floating ip's into k8s-config ssl context
  • Loading branch information
katyafervent authored Sep 28, 2018
2 parents 82bfb7d + 550cae2 commit 572f502
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion kqueen/engines/openstack_kubespray.py
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,15 @@ def _create_group_vars(self, metadata):
kubespray_vars["openstack_lbaas_subnet_id"] = metadata["resources"]["subnet_id"]
kubespray_vars["openstack_lbaas_floating_network_id"] = metadata["resources"]["ext_net_id"]
# See https://github.com/kubernetes-incubator/kubespray/issues/2141
# Set this variable to true to get rid of this issue```
# Set this variable to true to get rid of this issue
kubespray_vars["volume_cross_zone_attachment"] = True

# See https://github.com/kubernetes-incubator/kubespray/issues/1430
# Set all fips in this var to get rid of kubectl ssl-certs issue
ssl_fips = [master["fip"] for master in metadata["resources"]["masters"]]
if ssl_fips:
kubespray_vars["supplementary_addresses_in_ssl_keys"] = ssl_fips

image_var_names = [var_name for var_name in dir(config) if var_name.endswith(('_IMAGE_REPO', '_IMAGE_TAG'))]
image_variables = {k.lower(): getattr(config, k) for k in image_var_names}
kubespray_vars.update(image_variables)
Expand Down

0 comments on commit 572f502

Please sign in to comment.