CloudVPS: cleanup hiera values using old openstack services names
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	aborrero
	Jun 23 2020, 5:06 PM

Description

There are several projects using hiera values with deprecated names:

arturo@endurance:~/git/wmf/cloud/instance-puppet master $ git grep cloudcontrol1003
deployment-prep/deployment-acme-chief.yaml:profile::acme_chief::cloud::designate_sync_auth_url: http://cloudcontrol1003.wikimedia.org:5000/v3
maps/maps-acmechief.yaml:profile::acme_chief::cloud::designate_sync_auth_url: http://cloudcontrol1003.wikimedia.org:5000/v3
project-proxy/project-proxy-acme-chief.yaml:profile::acme_chief::cloud::designate_sync_auth_url: http://cloudcontrol1003.wikimedia.org:5000/v3
shinken/shinken-02.shinken.eqiad.wmflabs.yaml:profile::openstack::eqiad1::keystone_host: cloudcontrol1003.wikimedia.org
testlabs/abogott-puppetclient.testlabs.eqiad.wmflabs.yaml:- cloudcontrol1003.wikimedia.org
toolsbeta/toolsbeta-acme-chief.yaml:profile::acme_chief::cloud::designate_sync_auth_url: http://cloudcontrol1003.wikimedia.org:5000/v3
traffic/traffic-acmechief.yaml:profile::acme_chief::cloud::designate_sync_auth_url: http://cloudcontrol1003.wikimedia.org:5000/v3
arturo@endurance:~/git/wmf/cloud/instance-puppet master $ git grep cloud-ns0
deployment-prep/deployment-acme-chief.yaml:    - cloud-ns0.wikimedia.org.
maps/maps-acmechief.yaml:    - cloud-ns0.wikimedia.org.
project-proxy/project-proxy-acme-chief.yaml:    - cloud-ns0.wikimedia.org.
tools/tools-acme-chief.yaml:  cloud-ns0.wikimedia.org: 208.80.154.135
tools/tools-acme-chief.yaml:    - cloud-ns0.wikimedia.org.
arturo@endurance:~/git/wmf/cloud/instance-puppet master $ git grep cloud-ns1
deployment-prep/deployment-acme-chief.yaml:    - cloud-ns1.wikimedia.org.
maps/maps-acmechief.yaml:    - cloud-ns1.wikimedia.org.
project-proxy/project-proxy-acme-chief.yaml:    - cloud-ns1.wikimedia.org.
tools/tools-acme-chief.yaml:  cloud-ns1.wikimedia.org: 208.80.154.11
tools/tools-acme-chief.yaml:    - cloud-ns1.wikimedia.org.

Should use instead:

openstack.eqiad1.wikimediacloud.org for the API endpoints
ns0.openstack.eqiad1.wikimediacloud.org for cloud-ns0
ns1.openstack.eqiad1.wikimediacloud.org for cloud-ns1

I bet most of these values were copy/pasted from the acme-chief config guide at https://wikitech.wikimedia.org/wiki/Acme-chief/Cloud_VPS_setup which I already refreshed.

Details

	Subject	Repo	Branch	Lines +/-
	WMCS: replace a few stray URLS that weren't using the openstack server fqdn	operations/puppet	production	+2 -2

Customize query in gerrit

Related Objects
Search...

Status	Assigned	Task
Resolved	• taavi	T316436 Cloud VPS Terraform support
Resolved	Andrew	T319312 Open Openstack APIs to the public internet
Resolved	• taavi	T267194 CloudVPS: enable TLS in openstack API endpoints
Resolved	aborrero	T245173 CloudVPS: DNS improvements
Resolved	aborrero	T243766 Cloud DNS: proposal for new DNS service names
Resolved	Andrew	T256144 CloudVPS: cleanup hiera values using old openstack services names

Event Timeline

aborrero created this task.Jun 23 2020, 5:06 PM

Restricted Application edited projects, added cloud-services-team (Kanban); removed cloud-services-team. · View Herald TranscriptJun 23 2020, 5:06 PM

Restricted Application added a subscriber: Aklapper. · View Herald Transcript

aborrero triaged this task as Low priority.Jun 23 2020, 5:07 PM

aborrero moved this task from Inbox to Soon! on the cloud-services-team (Kanban) board.

aborrero added a parent task: T243766: Cloud DNS: proposal for new DNS service names.Jun 25 2020, 11:29 AM

Nintendofan885 subscribed.Jul 14 2020, 9:13 PM

We will review this as part of T267194

Change 774922 had a related patch set uploaded (by Andrew Bogott; author: Andrew Bogott):

[operations/puppet@production] WMCS: replace a few stray URLS that weren't using the openstack server fqdn

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

gerritbot added a project: Patch-For-Review.Mar 29 2022, 4:31 PM

--- a/maps/maps-acmechief.yaml
+++ b/maps/maps-acmechief.yaml
@@ -23,8 +23,8 @@ profile::acme_chief::challenges:
   dns-01:
     issuing_ca: letsencrypt.org
     ns_records:
-    - cloud-ns0.wikimedia.org.
-    - cloud-ns1.wikimedia.org.
+    - ns0.openstack.eqiad1.wikimediacloud.org.
+    - ns1.openstack.eqiad1.wikimediacloud.org.
     resolver_port: 53
     zone_update_cmd: /usr/local/bin/acme-chief-designate-sync.py
 profile::acme_chief::cloud::designate_sync_auth_url: https://openstack.eqiad1.wikimediacloud.org:25000/v3

diff --git a/tools/tools-acme-chief.yaml b/tools/tools-acme-chief.yaml
index 8b38cde4..e3248802 100644
--- a/tools/tools-acme-chief.yaml
+++ b/tools/tools-acme-chief.yaml
@@ -1,6 +1,6 @@
 authdns_servers:
-  cloud-ns0.wikimedia.org: 208.80.154.135
-  cloud-ns1.wikimedia.org: 208.80.154.11
+  ns0.openstack.eqiad1.wikimediacloud.org: 208.80.154.135
+  ns1.openstack.eqiad1.wikimediacloud.org: 208.80.154.11
 http_proxy: ''
 profile::acme_chief::accounts:
   09e23666d8dd57b8597b9fd9f0ecb4bb:

andrew@buster:~/instance-puppet$ git grep cloudcontrol1003
andrew@buster:~/instance-puppet$ git grep cloud-ns0
andrew@buster:~/instance-puppet$ git grep cloud-ns1
andrew@buster:~/instance-puppet$

Change 774922 merged by Andrew Bogott: