From 9f0bbc738a5ea69977460ea7c264ba5465692066 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 15 Jun 2018 13:53:32 +1000 Subject: [PATCH] Fix typo in packethost configuration This typo was introduced with I88ccdca80477fa06d33e5785d764a546e88a76a5; I copy-pasted it wrong. Change-Id: Ia1b66107b332bbb8cbb82c26ed6246c9506c014e --- modules/openstack_project/templates/nodepool/clouds.yaml.erb | 1 + .../templates/puppetmaster/all-clouds.yaml.erb | 3 +++ .../templates/puppetmaster/ansible-clouds.yaml.erb | 1 + 3 files changed, 5 insertions(+) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 617882e25e..c057464039 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -99,6 +99,7 @@ clouds: floating_ip_source: None cacert: /home/nodepool/.config/openstack/limestone_cacert.pem packethost: + regions: - name: us-west-1 values: networks: diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 94138cacda..058883c6f4 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -176,6 +176,7 @@ clouds: identity_api_version: 3 cacert: /etc/openstack/limestone_cacert.pem openstackci-packethost: + regions: - name: us-west-1 values: networks: @@ -188,7 +189,9 @@ clouds: project_name: <%= @puppetmaster_clouds['openstackci_packethost_project_name'] %> user_domain_name: default project_domain_name: default + openstackzuul-packethost: + regions: - name: us-west-1 values: networks: diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index f0195757d7..33a7c44242 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -99,6 +99,7 @@ clouds: identity_api_version: 3 cacert: /etc/openstack/limestone_cacert.pem openstackci-packethost: + regions: - name: us-west-1 values: networks: