Rush has submitted this change and it was merged.
Change subject: updates for nova hiera
......................................................................
updates for nova hiera
* $::site in hiera seems not to expand (tho $::facts do)
* missing some tricky keystone config
Change-Id: Iaaa80cc9b096ac78ea8cfed0d3758cdd6ecdff4d
---
M hieradata/common.yaml
M hieradata/eqiad.yaml
M manifests/role/labs/openstack/nova.pp
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index fffa883..554622b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -290,16 +290,12 @@
quota_floating_ips: '0'
libvirt_type: 'kvm'
my_ip: "%{::ipaddress_eth0}"
- zone: "${::site}"
network_public_interface: 'eth0'
- dhcp_domain: "${::site}.wmflabs"
network_flat_interface: 'eth1.1102'
network_flat_tagged_base_interface: 'eth1'
network_flat_interface_vlan: '1102'
flat_network_bridge: 'br1102'
- live_migration_uri: "qemu://%s.${::site}.wmnet/system?pkipath=/var/lib/nova"
fixed_range: '10.68.16.0/21'
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'
-
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 28bb310..9c861cd 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -92,7 +92,11 @@
ldap_host: *labsnovacontroller
puppet_host: *labsnovacontroller
puppet_db_host: *labsnovacontroller
+ dhcp_domain: 'eqiad.wmflabs'
+ live_migration_uri: 'qemu://%s.eqiad.wmnet/system?pkipath=/var/lib/nova'
+ zone: eqiad
keystoneconfig:
auth_port: '35357'
auth_protocol: 'http'
+ auth_host: 208.80.154.92
diff --git a/manifests/role/labs/openstack/nova.pp
b/manifests/role/labs/openstack/nova.pp
index b75e01a..ed27ff3 100644
--- a/manifests/role/labs/openstack/nova.pp
+++ b/manifests/role/labs/openstack/nova.pp
@@ -13,6 +13,7 @@
$status_wiki_host_master = hiera('status_wiki_host_master')
$novaconfig['bind_ip'] = ipresolve($keystone_host,4)
+ $novaconfig['keystone_auth_host'] = $keystoneconfig['auth_host']
$novaconfig['keystone_auth_port'] = $keystoneconfig['auth_port']
$novaconfig['keystone_admin_token'] = $keystoneconfig['admin_token']
$novaconfig['keystone_auth_protocol'] = $keystoneconfig['auth_protocol']
--
To view, visit https://gerrit.wikimedia.org/r/254187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaaa80cc9b096ac78ea8cfed0d3758cdd6ecdff4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
