From cb51d5b33212a05948433d37da0e411d0f8e1de6 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 7 Sep 2017 10:32:10 -0700 Subject: [PATCH] Force OVH to use ipv4 in shade OVH instances are getting ipv6 addresses now. This is great except that the only info on these addresses seems to be in the nova/neutron api and not via ipv6 router advertisements or config drive metadata. Until we sort out a programmatic way to configure ipv6 on the instances at boot lets not attempt to use ipv6 when connecting to OVH instances. Change-Id: I48e773b9f29fae9a15f6c95fc64831ab0749cc60 --- .../openstack_project/templates/nodepool/clouds.yaml.erb | 3 +++ .../templates/puppetmaster/all-clouds.yaml.erb | 6 ++++++ .../templates/puppetmaster/ansible-clouds.yaml.erb | 3 +++ 3 files changed, 12 insertions(+) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 1d8835af5d..3ade207f09 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -17,6 +17,9 @@ clouds: force_ipv4: true ovh: profile: ovh + # OVH has a weird new ipv6 setup that we can't handle properly + # for now ignore ipv6 + force_ipv4: true regions: - BHS1 - GRA1 diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index a98f3639ba..e2d686e019 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -89,6 +89,9 @@ clouds: - SBG1 - BHS1 profile: ovh + # OVH has a weird new ipv6 setup that we can't handle properly + # for now ignore ipv6 + force_ipv4: true auth: username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %> password: <%= @puppetmaster_clouds['openstackci_ovh_password'] %> @@ -143,6 +146,9 @@ clouds: - SBG1 - BHS1 profile: ovh + # OVH has a weird new ipv6 setup that we can't handle properly + # for now ignore ipv6 + force_ipv4: true auth: username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %> password: <%= @puppetmaster_clouds['openstackjenkins_ovh_password'] %> diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index f91f87ee71..f5dffcf20d 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -28,6 +28,9 @@ clouds: - SBG1 - BHS1 profile: ovh + # OVH has a weird new ipv6 setup that we can't handle properly + # for now ignore ipv6 + force_ipv4: true auth: username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %> password: <%= @puppetmaster_clouds['openstackci_ovh_password'] %>