Remove libvirt bootstrapping from AIO
With the implementation of I83e3fc349a0448e0411f369bdf4888ff81cb37a8 the libvirt bootstrapping of the AIO is no longer needed. Change-Id: I83080a145bb86d45e61623f879d41ddf91cff8b4 Closes-Bug: 1589440
This commit is contained in:
parent
b8802f5ce1
commit
d3f7e80ce0
@ -68,16 +68,6 @@ iptables -P INPUT ACCEPT
|
||||
iptables -P FORWARD ACCEPT
|
||||
iptables -P OUTPUT ACCEPT
|
||||
|
||||
# Adjust settings based on the Cloud Provider info in OpenStack-CI
|
||||
if [ -f /etc/nodepool/provider -a -s /etc/nodepool/provider ]; then
|
||||
source /etc/nodepool/provider
|
||||
|
||||
# Update the libvirt cpu map with a gate64 cpu model. This enables nova
|
||||
# live migration for 64bit guest OSes on heterogenous cloud "hardware".
|
||||
export BOOTSTRAP_OPTS="${BOOTSTRAP_OPTS} bootstrap_host_libvirt_config=yes"
|
||||
|
||||
fi
|
||||
|
||||
# Bootstrap an AIO
|
||||
pushd $(dirname ${0})/../tests
|
||||
sed -i '/\[defaults\]/a nocolor = 1/' ansible.cfg
|
||||
|
@ -16,9 +16,6 @@
|
||||
# Boolean option to implement OpenStack-Ansible configuration for an AIO
|
||||
bootstrap_host_aio_config: yes
|
||||
|
||||
# Boolean option to implement OpenStack-CI LibVirt Configuration Changes
|
||||
bootstrap_host_libvirt_config: no
|
||||
|
||||
## Swap memory
|
||||
# If there is no swap memory present, the bootstrap will create a loopback disk
|
||||
# for the purpose of having swap memory available. Swap is required for some of
|
||||
|
@ -92,12 +92,3 @@
|
||||
when: bootstrap_host_mongodb_service | bool
|
||||
tags:
|
||||
- install-mongodb
|
||||
|
||||
- name: Install LibVirt packages
|
||||
apt:
|
||||
name: "{{ item }}"
|
||||
state: present
|
||||
with_items: "{{ packages_libvirt }}"
|
||||
when: bootstrap_host_libvirt_config | bool
|
||||
tags:
|
||||
- install-libvirt
|
||||
|
@ -37,8 +37,3 @@ packages_mongodb:
|
||||
- mongodb-clients
|
||||
- mongodb-server
|
||||
- python-pymongo
|
||||
|
||||
packages_libvirt:
|
||||
- libvirt-bin
|
||||
|
||||
servicename_libvirt: libvirt-bin
|
||||
|
Loading…
Reference in New Issue
Block a user