[MediaWiki-commits] [Gerrit] Move novaadmin authority from 'testlabs' to 'admin' - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Move novaadmin authority from 'testlabs' to 'admin'
..


Move novaadmin authority from 'testlabs' to 'admin'

Having the 'testlabs' project contain the admin role
for administrative tasks is a weird historical leftover.  We
now have an 'admin' project which can serve this purpose
and be less confusing to future users.

Change-Id: I3b6a1ebbef463296c7407a3fac388fc78e4635f0
---
M hieradata/eqiad.yaml
M modules/openstack/files/kilo/virtscripts/cold-migrate
M modules/openstack/files/kilo/virtscripts/cold-nova-migrate
M modules/openstack/files/kilo/virtscripts/live-migrate
4 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index d6d5f18..95e998c 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -123,8 +123,8 @@
   auth_port: '35357'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
-  admin_project_id: 'testlabs'
-  admin_project_name: 'testlabs'
+  admin_project_id: 'admin'
+  admin_project_name: 'admin'
 
 designateconfig:
   db_host:  'm5-master.eqiad.wmnet'
diff --git a/modules/openstack/files/kilo/virtscripts/cold-migrate 
b/modules/openstack/files/kilo/virtscripts/cold-migrate
index 0c4652c..63be3c7 100755
--- a/modules/openstack/files/kilo/virtscripts/cold-migrate
+++ b/modules/openstack/files/kilo/virtscripts/cold-migrate
@@ -134,7 +134,7 @@
 argparser.add_argument(
 '--nova-project',
 help='project for nova auth',
-default='testlabs'
+default='admin'
 )
 argparser.add_argument(
 '--mysql-password',
diff --git a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate 
b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
index 64eb0e8..c039346 100755
--- a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
+++ b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
@@ -107,7 +107,7 @@
 argparser.add_argument(
 '--nova-project',
 help='project for nova auth',
-default='testlabs'
+default='admin'
 )
 argparser.add_argument(
 '--no-restart',
diff --git a/modules/openstack/files/kilo/virtscripts/live-migrate 
b/modules/openstack/files/kilo/virtscripts/live-migrate
index 512acda..a1fab3d 100755
--- a/modules/openstack/files/kilo/virtscripts/live-migrate
+++ b/modules/openstack/files/kilo/virtscripts/live-migrate
@@ -131,7 +131,7 @@
 argparser.add_argument(
 '--nova-project',
 help='project for nova auth',
-default='testlabs'
+default='admin'
 )
 argparser.add_argument(
 'instanceid',

-- 
To view, visit https://gerrit.wikimedia.org/r/271420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b6a1ebbef463296c7407a3fac388fc78e4635f0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move novaadmin authority from 'testlabs' to 'admin' - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/271420

Change subject: Move novaadmin authority from 'testlabs' to 'admin'
..

Move novaadmin authority from 'testlabs' to 'admin'

Having the 'testlabs' project contain the admin role
for administrative tasks is a weird historical leftover.  We
now have an 'admin' project which can serve this purpose
and be less confusing to future users.

Change-Id: I3b6a1ebbef463296c7407a3fac388fc78e4635f0
---
M hieradata/eqiad.yaml
M modules/openstack/files/kilo/virtscripts/cold-migrate
M modules/openstack/files/kilo/virtscripts/cold-nova-migrate
M modules/openstack/files/kilo/virtscripts/live-migrate
M modules/openstack/templates/novaenv.sh.erb
5 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/271420/1

diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index d6d5f18..95e998c 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -123,8 +123,8 @@
   auth_port: '35357'
   auth_protocol: 'http'
   auth_host: 208.80.154.92
-  admin_project_id: 'testlabs'
-  admin_project_name: 'testlabs'
+  admin_project_id: 'admin'
+  admin_project_name: 'admin'
 
 designateconfig:
   db_host:  'm5-master.eqiad.wmnet'
diff --git a/modules/openstack/files/kilo/virtscripts/cold-migrate 
b/modules/openstack/files/kilo/virtscripts/cold-migrate
index 0c4652c..63be3c7 100755
--- a/modules/openstack/files/kilo/virtscripts/cold-migrate
+++ b/modules/openstack/files/kilo/virtscripts/cold-migrate
@@ -134,7 +134,7 @@
 argparser.add_argument(
 '--nova-project',
 help='project for nova auth',
-default='testlabs'
+default='admin'
 )
 argparser.add_argument(
 '--mysql-password',
diff --git a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate 
b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
index 64eb0e8..c039346 100755
--- a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
+++ b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate
@@ -107,7 +107,7 @@
 argparser.add_argument(
 '--nova-project',
 help='project for nova auth',
-default='testlabs'
+default='admin'
 )
 argparser.add_argument(
 '--no-restart',
diff --git a/modules/openstack/files/kilo/virtscripts/live-migrate 
b/modules/openstack/files/kilo/virtscripts/live-migrate
index 512acda..a1fab3d 100755
--- a/modules/openstack/files/kilo/virtscripts/live-migrate
+++ b/modules/openstack/files/kilo/virtscripts/live-migrate
@@ -131,7 +131,7 @@
 argparser.add_argument(
 '--nova-project',
 help='project for nova auth',
-default='testlabs'
+default='admin'
 )
 argparser.add_argument(
 'instanceid',
diff --git a/modules/openstack/templates/novaenv.sh.erb 
b/modules/openstack/templates/novaenv.sh.erb
index d63f13b..c01787b 100644
--- a/modules/openstack/templates/novaenv.sh.erb
+++ b/modules/openstack/templates/novaenv.sh.erb
@@ -4,6 +4,6 @@
 export OS_PASSWORD="<%= @wikitech_nova_ldap_user_pass %>"
 export OS_AUTH_URL="http://<%= @nova_controller_hostname %>:35357/v3"
 export OS_REGION_NAME="<%= @nova_region %>"
-export OS_TENANT_NAME="testlabs"
+export OS_TENANT_NAME=<%= @wikitech_nova_admin_project_name %>
 export OS_NO_CACHE=1
 export OS_IDENTITY_API_VERSION=3

-- 
To view, visit https://gerrit.wikimedia.org/r/271420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b6a1ebbef463296c7407a3fac388fc78e4635f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits