Andrew Bogott has submitted this change and it was merged. Change subject: Mark a couple of obsolete settings as obsolete. ......................................................................
Mark a couple of obsolete settings as obsolete. Change-Id: I7142b4aa337190213c204325027dee95a41e6530 --- M modules/openstack/templates/icehouse/nova/nova.conf.erb 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/icehouse/nova/nova.conf.erb b/modules/openstack/templates/icehouse/nova/nova.conf.erb index 16fa10d..1697d7c 100644 --- a/modules/openstack/templates/icehouse/nova/nova.conf.erb +++ b/modules/openstack/templates/icehouse/nova/nova.conf.erb @@ -30,8 +30,6 @@ dhcpbridge_flagfile=/etc/nova/nova.conf dhcpbridge=/usr/bin/nova-dhcpbridge dhcp_domain=<%= novaconfig["dhcp_domain"] %> -node_availability_zone=<%= novaconfig["zone"] %> -zone_name=<%= novaconfig["zone"] %> quota_floating_ips=<%= novaconfig["quota_floating_ips"] %> quota_fixed_ips=200 api_paste_config=/etc/nova/api-paste.ini @@ -118,3 +116,10 @@ # Default ram overprovision ration is 1.5. We just had a box OOM, so reducing # that to 1.3. ram_allocation_ratio=1.3 + + +# Deprecated, remove in Kilo: +node_availability_zone=<%= novaconfig["zone"] %> +zone_name=<%= novaconfig["zone"] %> +# Should be: +#default_availability_zone = <%= novaconfig["zone"] %> -- To view, visit https://gerrit.wikimedia.org/r/203879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7142b4aa337190213c204325027dee95a41e6530 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Chasemp <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
