diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 43f278c3b8..4217552b78 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -174,3 +174,23 @@ clouds: project_id: bed89257500340af8d0fbe7141b1bfd6 project_domain_id: a5e7d1a8f25b42b081cf89d1130638da user_domain_id: a5e7d1a8f25b42b081cf89d1130638da + openstackci-linaro: + regions: + - RegionOne + auth: + auth_url: https://cn1.linaro.cloud:35357 + username: <%= @puppetmaster_clouds['openstackci_linaro_username'] %> + password: <%= @puppetmaster_clouds['openstackci_linaro_password'] %> + project_name: <%= @puppetmaster_clouds['openstackci_linaro_project_name'] %> + project_domain_name: default + user_domain_name: default + openstackzuul-linaro: + regions: + - RegionOne + auth: + auth_url: https://cn1.linaro.cloud:35357 + username: <%= @puppetmaster_clouds['openstackzuul_linaro_username'] %> + password: <%= @puppetmaster_clouds['openstackzuul_linaro_password'] %> + project_name: <%= @puppetmaster_clouds['openstackzuul_linaro_project_name'] %> + project_domain_name: default + user_domain_name: default diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 015b67ebe8..51f988520e 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -88,3 +88,13 @@ clouds: project_id: 656841f5d46e4b0889129d1fc20bd0b8 project_domain_id: a5e7d1a8f25b42b081cf89d1130638da user_domain_id: a5e7d1a8f25b42b081cf89d1130638da + openstackci-linaro: + regions: + - RegionOne + auth: + auth_url: https://cn1.linaro.cloud:35357 + username: <%= @puppetmaster_clouds['openstackci_linaro_username'] %> + password: <%= @puppetmaster_clouds['openstackci_linaro_password'] %> + project_name: <%= @puppetmaster_clouds['openstackci_linaro_project_name'] %> + project_domain_name: default + user_domain_name: default