C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add an 'access_ip' for openstack resources to the terraform inventory builder script (#3592)

Browse source 
* Add an 'access_ip' for openstack resources to the terraform inventory builder script

* Update Openstack README

* Only use ipv4

* If there's a floating IP assigned to an openstack instance, use that for access_ip
This commit is contained in:
Ted Wexler 2018-10-29 14:28:23 -04:00 committed by Antoine Legrand
parent 0acb823d96
commit 58b4fea2b1
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/terraform/openstack/README.md
View file

@ -436,14 +436,6 @@ $ kubectl config use-context default-system
kubectl version kubectl version
``` ```
If you are using floating ip addresses then you may get this error:
```
Unable to connect to the server: x509: certificate is valid for 10.0.0.6, 10.233.0.1, 127.0.0.1, not 132.249.238.25
```
You can tell kubectl to ignore this condition by adding the
`--insecure-skip-tls-verify` option.
## GlusterFS ## GlusterFS
GlusterFS is not deployed by the standard`cluster.yml` playbook, see the GlusterFS is not deployed by the standard`cluster.yml` playbook, see the
[GlusterFS playbook documentation](../../network-storage/glusterfs/README.md) [GlusterFS playbook documentation](../../network-storage/glusterfs/README.md)

2
contrib/terraform/terraform.py
View file

@ -328,6 +328,7 @@ def openstack_host(resource, module_name):
attrs = { attrs = {
'access_ip_v4': raw_attrs['access_ip_v4'], 'access_ip_v4': raw_attrs['access_ip_v4'],
'access_ip_v6': raw_attrs['access_ip_v6'], 'access_ip_v6': raw_attrs['access_ip_v6'],
'access_ip': raw_attrs['access_ip_v4'],
'ip': raw_attrs['network.0.fixed_ip_v4'], 'ip': raw_attrs['network.0.fixed_ip_v4'],
'flavor': parse_dict(raw_attrs, 'flavor', 'flavor': parse_dict(raw_attrs, 'flavor',
sep='_'), sep='_'),
@ -685,6 +686,7 @@ def iter_host_ips(hosts, ips):
ip = ips[host_id] ip = ips[host_id]
host[1].update({ host[1].update({
'access_ip_v4': ip, 'access_ip_v4': ip,
'access_ip': ip,
'public_ipv4': ip, 'public_ipv4': ip,
'ansible_ssh_host': ip, 'ansible_ssh_host': ip,
}) })