diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 1793554183..d721dab3b8 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -50,6 +50,8 @@ clouds: username: '<%= @vexxhost_username %>' password: '<%= @vexxhost_password %>' project_name: '<%= @vexxhost_project %>' + project_domain_name: default + user_domain_name: default image_format: 'raw' citycloud: regions: diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index a6a10edc3b..0948055b0a 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -76,6 +76,8 @@ clouds: username: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_username'] %>' password: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_password'] %>' project_name: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_project_name'] %>' + project_domain_name: default + user_domain_name: default openstackci-vexxhost: region_name: ca-ymq-1 profile: vexxhost @@ -83,6 +85,8 @@ clouds: username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>' + project_domain_name: default + user_domain_name: default openstackci-citycloud: regions: - Lon1 diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index c08a0f04fd..74b6511a4c 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -52,6 +52,8 @@ clouds: username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>' + project_domain_name: default + user_domain_name: default openstackci-citycloud: regions: - Lon1