Andrew Bogott has submitted this change and it was merged.

Change subject: openstack nova network: update private_ips of instances
......................................................................


openstack nova network: update private_ips of instances

Get rid of the 'udplog' deployment-tin one as this instance has no public IP or
udplog instance - I think it's predecessor, deployment-bastion, probably did,
and that may have run udp2log...?

To be honest, I question whether we need to keep these entries around at all or
if we should delete them they've been broken so long.

Also comment labs instance IPs around the repository with the instance names.

Change-Id: Ia3b05dffce0e4a593b97c6c7508c0bcee7735973
---
M hieradata/labs.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/openstack/manifests/nova/network.pp
3 files changed, 8 insertions(+), 11 deletions(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 8af7c5f..e70bc12 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -115,7 +115,7 @@
     hosts:
       "%{::fqdn}": 1
 
-nrpe::allowed_hosts: '10.68.16.195'
+nrpe::allowed_hosts: '10.68.16.195' # icinga
 
 ssh::server::disable_agent_forwarding: false
 labs_puppet_master: "labs-puppetmaster-eqiad.wikimedia.org"
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 5bc0e50..c48d55c 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -101,8 +101,8 @@
 cassandra::target_version: '2.2'
 cassandra::metrics::graphite_host: labmon1001.eqiad.wmnet
 restbase::seeds:
-  - 10.68.16.128
-  - 10.68.17.189
+  - 10.68.16.128 # deployment-restbase01
+  - 10.68.17.189 # deployment-restbase02
 # used for rate limiting
 restbase::hosts:
   - deployment-restbase01.deployment-prep.eqiad.wmflabs
@@ -159,7 +159,7 @@
 "role::logging::mediawiki::log_directory": /data/project/logs
 "role::mediawiki::webserver::pool": one-pool-to-rule-them-all
 "beta::syncsiteresources::user": www-data
-"role::url_downloader::url_downloader_ip": 10.68.16.135
+"role::url_downloader::url_downloader_ip": 10.68.16.135 # 
deployment-urldownloader
 "zotero::http_proxy": 
deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
 "trebuchet::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs
 "scap::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs
@@ -204,10 +204,10 @@
 role::logstash::statsd_host: labmon1001.eqiad.wmnet
 "mediawiki::redis_servers::eqiad":
   shard01:
-    host: 10.68.16.177
+    host: 10.68.16.177 # deployment-redis01
     port: 6379
   shard02:
-    host: 10.68.16.231
+    host: 10.68.16.231 # deployment-redis02
     port: 6379
 nfs_mounts:
   project: false
diff --git a/modules/openstack/manifests/nova/network.pp 
b/modules/openstack/manifests/nova/network.pp
index cced6b4..72aeacb 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -29,13 +29,10 @@
         'relic'                     => {public_ip  => '208.80.155.197',
                                         private_ip => '10.68.16.162' },
         'tools-webproxy'            => {public_ip  => '208.80.155.131',
-                                        private_ip => '10.68.17.139' },
-        'udplog'                    => {public_ip  => '208.80.155.191',
-                                        private_ip => '10.68.17.240' },
-
+                                        private_ip => '10.68.21.49' },
         # A wide variety of hosts are reachable via a public web proxy.
         'labs_shared_proxy' => {public_ip  => '208.80.155.156',
-                                private_ip => '10.68.16.65'},
+                                private_ip => '10.68.21.68'},
     }
 
     $dnsconfig = hiera_hash('labsdnsconfig', {})

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3b05dffce0e4a593b97c6c7508c0bcee7735973
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to