From c9dfa29fc03a9b16004c0e9ab45da81dba7d6581 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 15 Jun 2018 07:18:39 +1000 Subject: [PATCH] Add default network to packethost For ... reasons ... it seems we can't detect the default network on packethost. Override it in clouds.yaml, while we possibly figure out what is going wrong. Change-Id: I88ccdca80477fa06d33e5785d764a546e88a76a5 --- .../templates/nodepool/clouds.yaml.erb | 7 +++++-- .../templates/puppetmaster/all-clouds.yaml.erb | 14 ++++++++++---- .../templates/puppetmaster/ansible-clouds.yaml.erb | 7 +++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index d721dab3b8..617882e25e 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -99,8 +99,11 @@ clouds: floating_ip_source: None cacert: /home/nodepool/.config/openstack/limestone_cacert.pem packethost: - regions: - - us-west-1 + - name: us-west-1 + values: + networks: + - name: openstackzuul-net + default: True auth: auth_url: https://packet.platform9.net/keystone username: <%= @packethost_username %> diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 0948055b0a..94138cacda 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -176,8 +176,11 @@ clouds: identity_api_version: 3 cacert: /etc/openstack/limestone_cacert.pem openstackci-packethost: - regions: - - us-west-1 + - name: us-west-1 + values: + networks: + - name: openstackci-net + default: True auth: auth_url: https://packet.platform9.net/keystone username: <%= @puppetmaster_clouds['openstackci_packethost_username'] %> @@ -186,8 +189,11 @@ clouds: user_domain_name: default project_domain_name: default openstackzuul-packethost: - regions: - - us-west-1 + - name: us-west-1 + values: + networks: + - name: openstackzuul-net + default: True auth: auth_url: https://packet.platform9.net/keystone username: <%= @puppetmaster_clouds['openstackzuul_packethost_username'] %> diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 74b6511a4c..f0195757d7 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -99,8 +99,11 @@ clouds: identity_api_version: 3 cacert: /etc/openstack/limestone_cacert.pem openstackci-packethost: - regions: - - us-west-1 + - name: us-west-1 + values: + networks: + - name: openstackci-net + default: True auth: auth_url: https://packet.platform9.net/keystone username: <%= @puppetmaster_clouds['openstackci_packethost_username'] %>