Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276893
Change subject: horizon: Add dynamicproxy IPs to config
......................................................................
horizon: Add dynamicproxy IPs to config
Bug: T129245
Change-Id: I72c584791f98937644af62e6fd4c7023703437a1
---
M hieradata/codfw/labtest.yaml
M hieradata/common.yaml
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
3 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/276893/1
diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 7665a73..74275bc 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -75,7 +75,8 @@
zone: codfw
scheduler_pool:
- labtestvirt2001
-
+ # labs-dynamicproxy-test.openstack.eqiad.wmflabs
+ dynamicproxy_ip: '208.80.155.240'
keystoneconfig:
db_name: 'keystone'
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ccff86e..51b22b2 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -302,6 +302,8 @@
dhcp_start: '10.68.16.4'
network_public_ip: '208.80.155.255'
dmz_cidr: '208.80.155.0/22,10.0.0.0/8'
+ # novaproxy-01.project-proxy.eqiad.wmflabs
+ dynamicproxy_ip: '208.80.155.156'
keystoneconfig:
db_name: 'keystone'
diff --git a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
index d544e3a..ba8b176 100644
--- a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
+++ b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
@@ -525,3 +525,6 @@
HORIZON_IMAGES_ALLOW_UPLOAD = False
DESIGNATE = { 'records_use_fips': True }
+
+# WMF-specific dynamicproxy settings
+PROXY_API_URL = 'http://<%= @novaconfig['dynamicproxy_ip'] %>:5668'
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/276893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72c584791f98937644af62e6fd4c7023703437a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
