From a05486fa222f9074709d57f5bf86852da17eebcb Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 22 Jun 2018 10:38:20 +1000 Subject: [PATCH] Add identity_api_version to packethost Every "openstack" cli operation gives Ignoring domain related config project_domain_name because identity API version is 2.0 Ignoring domain related config user_domain_name because identity API version is 2.0 I feel like this should be auto-detected to v3 but not sure how. Add the identity_api_version as done in the other clouds. (I proposed making that message clearer in https://review.openstack.org/577324) Change-Id: I22f8d342968c9084d05d841d6e3ab660a62c3262 --- modules/openstack_project/templates/nodepool/clouds.yaml.erb | 1 + .../openstack_project/templates/puppetmaster/all-clouds.yaml.erb | 1 + .../templates/puppetmaster/ansible-clouds.yaml.erb | 1 + 3 files changed, 3 insertions(+) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 597e94da3d..f2a7aa5428 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -112,3 +112,4 @@ clouds: project_name: <%= @packethost_project %> user_domain_name: default project_domain_name: default + identity_api_version: '3' diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 4dedd36920..c3ee76c9a2 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -204,3 +204,4 @@ clouds: project_name: <%= @puppetmaster_clouds['openstackzuul_packethost_project_name'] %> user_domain_name: default project_domain_name: default + identity_api_version: '3' diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index a705910ddd..16b33f460d 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -112,3 +112,4 @@ clouds: project_name: <%= @puppetmaster_clouds['openstackci_packethost_project_name'] %> user_domain_name: default project_domain_name: default + identity_api_version: '3'