CI: Fix integration job

Deckhand's integration job relies on OpenStack-Helm-Infra to deploy
Kubernetes using Kubeadm. Since [0] was merged, Calico requires AppArmor
to be deployed. This commit adds the same role to deploy AppArmor that
exists in OpenStack-Helm-Infra to prevent inadvertent gate failures.

[0] https://review.openstack.org/614805/

This also includes gate fix in https://review.openstack.org/#/c/627906/
because of a circular dependency; that change in question fixes
failing CI jobs for all non-integration jobs.

Change-Id: Ie3fb04ea0fbe0487ae743033315e2a4211248d32
This commit is contained in:
Drew Walters 2019-01-14 11:52:10 -06:00 committed by Felipe Monteiro
parent 1e0987046f
commit f745e4b6e7
3 changed files with 48 additions and 1 deletions

View File

@ -38,7 +38,6 @@ python-barbicanclient==4.7.0
python-keystoneclient==3.18.0
python-memcached==1.59
requests==2.20.0
Routes==2.4.1
six==1.11.0
stevedore==1.30.0

View File

@ -39,3 +39,15 @@
- upgrade-host
- start-zuul-console
- disable-local-nameserver
- hosts: all
vars_files:
- vars.yaml
vars:
work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
gather_facts: False
become: yes
roles:
- deploy-apparmor
tags:
- deploy-apparmor

View File

@ -0,0 +1,36 @@
# Copyright 2018 The Openstack-Helm Authors.
#
# 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.
- block:
- name: Ensuring AppArmor is deployed on host
when: ansible_distribution == 'Ubuntu'
include_role:
name: deploy-package
tasks_from: dist
vars:
packages:
deb:
- apparmor
- name: Enable AppArmor
when: ansible_distribution == 'Ubuntu'
become: true
shell: |-
set -xe
systemctl enable apparmor
systemctl start apparmor
systemctl status apparmor.service
args:
executable: /bin/bash
ignore_errors: True