From 787c7d7f8d45261133abe7b68786ac78a15eb99c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 11 May 2017 12:40:32 -0700 Subject: [PATCH] Flip cityclouds projects around The way we got quotas assigned we need to flip the projects assigned to users around so that the zuul user gets to run 50 instances per region and the ci user has just enough to boot the region local mirrors. Change-Id: I053cf630e513fbb795f8039672a8073a354bf9b6 --- modules/openstack_project/templates/nodepool/clouds.yaml.erb | 2 +- .../templates/puppetmaster/all-clouds.yaml.erb | 4 ++-- .../templates/puppetmaster/ansible-clouds.yaml.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 4bff3e31c3..269315185f 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -155,7 +155,7 @@ clouds: auth: username: '<%= @citycloud_username %>' password: '<%= @citycloud_password %>' - project_id: 656841f5d46e4b0889129d1fc20bd0b8 + project_id: bed89257500340af8d0fbe7141b1bfd6 project_domain_id: a5e7d1a8f25b42b081cf89d1130638da user_domain_id: a5e7d1a8f25b42b081cf89d1130638da entercloud: diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 11ac5d6e6e..c3a1e1aa1b 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -327,7 +327,7 @@ clouds: auth: username: <%= @puppetmaster_clouds['openstackci_citycloud_username'] %> password: <%= @puppetmaster_clouds['openstackci_citycloud_password'] %> - project_id: bed89257500340af8d0fbe7141b1bfd6 + project_id: 656841f5d46e4b0889129d1fc20bd0b8 project_domain_id: a5e7d1a8f25b42b081cf89d1130638da user_domain_id: a5e7d1a8f25b42b081cf89d1130638da openstackzuul-citycloud: @@ -340,7 +340,7 @@ clouds: auth: username: <%= @puppetmaster_clouds['openstackzuul_citycloud_username'] %> password: <%= @puppetmaster_clouds['openstackzuul_citycloud_password'] %> - project_id: 656841f5d46e4b0889129d1fc20bd0b8 + project_id: bed89257500340af8d0fbe7141b1bfd6 project_domain_id: a5e7d1a8f25b42b081cf89d1130638da user_domain_id: a5e7d1a8f25b42b081cf89d1130638da openstackzuul-entercloud: diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 1852bf4b70..de96ee2c69 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -147,6 +147,6 @@ clouds: auth: username: <%= @puppetmaster_clouds['openstackci_citycloud_username'] %> password: <%= @puppetmaster_clouds['openstackci_citycloud_password'] %> - project_id: bed89257500340af8d0fbe7141b1bfd6 + project_id: 656841f5d46e4b0889129d1fc20bd0b8 project_domain_id: a5e7d1a8f25b42b081cf89d1130638da user_domain_id: a5e7d1a8f25b42b081cf89d1130638da