Andrew Bogott has submitted this change and it was merged. Change subject: Move labvirt1004 to Juno, and limit schedule pool to just labvirt1004. ......................................................................
Move labvirt1004 to Juno, and limit schedule pool to just labvirt1004. Icehouse can't schedule new instances, but labvirt1004 has lots of space. So this gives us some time to make sure Juno is solid before upgrading the other labvirt nodes to Juno. Bug: T104587 Change-Id: Ibe47490ebf8722aa49202e8e9d9704468b89254a --- M hieradata/hosts/labvirt1004.yaml M modules/openstack/templates/juno/nova/nova.conf.erb 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/labvirt1004.yaml b/hieradata/hosts/labvirt1004.yaml index 0f97ce9..506b93a 100644 --- a/hieradata/hosts/labvirt1004.yaml +++ b/hieradata/hosts/labvirt1004.yaml @@ -1 +1,2 @@ role::nova::compute::instance_dev: "/dev/sdb1" +openstack::version: juno diff --git a/modules/openstack/templates/juno/nova/nova.conf.erb b/modules/openstack/templates/juno/nova/nova.conf.erb index 58c7efd..b6e8eb3 100644 --- a/modules/openstack/templates/juno/nova/nova.conf.erb +++ b/modules/openstack/templates/juno/nova/nova.conf.erb @@ -9,7 +9,9 @@ instance_name_template=i-%08x daemonize=1 scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler -wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009 +#wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009 +# Temporarily limit the pool to just labvirt1004 until everything is moved to Juno. +wmf_scheduler_hosts_pool=labvirt1004 scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter # Don't allow duplicate instance names -- To view, visit https://gerrit.wikimedia.org/r/234048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe47490ebf8722aa49202e8e9d9704468b89254a Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[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
