Merge "Switching local gating scripts to Python3 to comply with Zuul"
This commit is contained in:
commit
9eb5449b5c
@ -10,12 +10,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Install python-docker Module
|
||||
- name: Install python3-docker and python3-requests Modules
|
||||
apt:
|
||||
pkg:
|
||||
- python-docker
|
||||
- python3-docker
|
||||
- python-requests
|
||||
- python3-requests
|
||||
state: present
|
||||
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
|
||||
|
@ -22,7 +22,6 @@
|
||||
- libvirt-devel
|
||||
- libvirt-daemon-kvm
|
||||
- qemu-kvm
|
||||
- virt-install
|
||||
state: present
|
||||
- name: Ensuring Libvirt, Qemu and support packages are present
|
||||
become: true
|
||||
@ -33,11 +32,8 @@
|
||||
- libvirt-bin
|
||||
- libguestfs-tools
|
||||
- qemu-kvm
|
||||
- virtinst
|
||||
- python-lxml
|
||||
- python3-lxml
|
||||
- python3-libvirt
|
||||
- python-libvirt
|
||||
- dnsmasq
|
||||
- ebtables
|
||||
state: present
|
||||
|
@ -23,7 +23,6 @@
|
||||
name:
|
||||
- python3-pip
|
||||
- python3-libvirt
|
||||
- python-libvirt
|
||||
state: present
|
||||
|
||||
- name: Install sushy-tools
|
||||
|
@ -11,7 +11,6 @@
|
||||
name:
|
||||
- python3-pip
|
||||
- python3-libvirt
|
||||
- python-libvirt
|
||||
state: present
|
||||
|
||||
- name: Install required pip packages
|
||||
|
@ -32,10 +32,9 @@ mkdir -p "$TMP_DIR"
|
||||
envsubst <"${AIRSHIPCTL_WS}/tools/gate/config_template.yaml" > "$PLAYBOOK_CONFIG"
|
||||
|
||||
# use new version of ansible, Ubuntu has old one
|
||||
sudo apt install software-properties-common
|
||||
sudo apt-add-repository --yes --update ppa:ansible/ansible
|
||||
sudo apt-get -y update
|
||||
sudo apt-get -y --no-install-recommends install docker.io ansible make python-passlib
|
||||
sudo apt install software-properties-common python3-pip
|
||||
sudo apt-get -y --no-install-recommends install docker.io make
|
||||
sudo pip3 install ansible
|
||||
|
||||
echo "primary ansible_host=localhost ansible_connection=local" > "$ANSIBLE_HOSTS"
|
||||
echo "primary ansible_host=localhost ansible_connection=local ansible_python_interpreter=/usr/bin/python3" > "$ANSIBLE_HOSTS"
|
||||
printf "[defaults]\nroles_path = %s/roles\n" "$AIRSHIPCTL_WS" > "$ANSIBLE_CFG"
|
||||
|
Loading…
x
Reference in New Issue
Block a user