From f479a214c8d16d81172e7607fdc584798b2cc631 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Mon, 6 Jun 2016 11:05:07 +0100 Subject: [PATCH] Do not use cpu_map_update.py anymore Because of the change [1], the file tools/cpu_map_update.py was removed, and we rely on this file for gating. However, according to the same review, this shouldn't be done anymore because "nova has been fixed" (I've got no evidence of it yet). This should fix the gate issue. [1]: https://review.openstack.org/#/c/324562/ Change-Id: I83e3fc349a0448e0411f369bdf4888ff81cb37a8 Depends-On: I198db581db22655dc8791ba40a77a39b362c1b73 Closes-Bug: 1589440 Signed-off-by: Jean-Philippe Evrard --- tests/roles/bootstrap-host/tasks/main.yml | 6 --- .../tasks/prepare_libvirt_service.yml | 53 ------------------- 2 files changed, 59 deletions(-) delete mode 100644 tests/roles/bootstrap-host/tasks/prepare_libvirt_service.yml diff --git a/tests/roles/bootstrap-host/tasks/main.yml b/tests/roles/bootstrap-host/tasks/main.yml index ed738b7b25..5df27b21d7 100644 --- a/tests/roles/bootstrap-host/tasks/main.yml +++ b/tests/roles/bootstrap-host/tasks/main.yml @@ -111,9 +111,3 @@ when: bootstrap_host_mongodb_users | bool tags: - prepare-mongodb-users - -# Prepare the LibVirt Service for Nova -- include: prepare_libvirt_service.yml - when: bootstrap_host_libvirt_config | bool - tags: - - prepare-libvirt-service diff --git a/tests/roles/bootstrap-host/tasks/prepare_libvirt_service.yml b/tests/roles/bootstrap-host/tasks/prepare_libvirt_service.yml deleted file mode 100644 index 73c08f3d5e..0000000000 --- a/tests/roles/bootstrap-host/tasks/prepare_libvirt_service.yml +++ /dev/null @@ -1,53 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Download LibVirt CPU map configuration script - get_url: - url: "http://git.openstack.org/cgit/openstack-dev/devstack/plain/tools/cpu_map_update.py" - dest: /openstack/cpu_map_update.py - validate_certs: yes - mode: 755 - register: libvirt_cpu_map_download - tags: - - libvirt-cpu-map-download - -# Update the libvirt cpu map with a gate64 cpu model. This enables nova -# live migration for 64bit guest OSes on heterogenous cloud "hardware". -- name: Execute LibVirt CPU map configuration script - shell: /openstack/cpu_map_update.py /usr/share/libvirt/cpu_map.xml - when: libvirt_cpu_map_download | changed - tags: - - libvirt-cpu-map-updated - -# libvirt detects various settings on startup, as we potentially changed -# the system configuration (modules, filesystems), we need to restart -# libvirt to detect those changes. Use a stop start as otherwise the new -# cpu_map is not loaded properly on some systems (Ubuntu). -- name: Stop libvirt-bin - service: - name: "{{ servicename_libvirt }}" - state: stopped - when: libvirt_cpu_map_download | changed - tags: - - libvirt-service-stop - -- name: Start libvirt-bin - service: - name: "{{ servicename_libvirt }}" - state: started - when: libvirt_cpu_map_download | changed - tags: - - libvirt-service-start -