Re-organizing some files for zuul CI
Change-Id: I1bd8ff3b7aa2deb5b002948dfb0fad500346b430
This commit is contained in:
parent
4bdaf6b628
commit
20cfd56994
|
@ -2,7 +2,7 @@
|
|||
name: openstack/ansible-role-k8s-mariadb
|
||||
check:
|
||||
jobs:
|
||||
- ansible-role-k8s-mariadb-centos
|
||||
- ansible-role-k8s-mariadb-kubernetes-centos
|
||||
|
||||
- nodeset:
|
||||
name: ansible-role-k8s-centos
|
||||
|
@ -19,6 +19,9 @@
|
|||
timeout: 10800
|
||||
|
||||
- job:
|
||||
name: ansible-role-k8s-mariadb-centos
|
||||
name: ansible-role-k8s-mariadb-kubernetes-centos
|
||||
parent: ansible-role-k8s-base
|
||||
nodeset: ansible-role-k8s-centos
|
||||
vars:
|
||||
coe: kubernetes
|
||||
project_name: ansible-role-k8s-mariadb
|
||||
|
|
|
@ -20,26 +20,16 @@
|
|||
- "system_logs"
|
||||
- "ansible"
|
||||
|
||||
- include: pre_rhel.yml
|
||||
when: ansible_os_family == 'RedHat'
|
||||
|
||||
- include: pre_debian.yml
|
||||
when: ansible_os_family == 'Debian'
|
||||
- include: 'roles/{{coe}}/tasks/pre.yml'
|
||||
|
||||
- name: Create symlink for this role
|
||||
become: true
|
||||
file:
|
||||
src: "{{ ansible_env.HOME }}/{{ zuul.project.src_dir }}"
|
||||
dest: "/etc/ansible/roles/ansible-role-k8s-mariadb"
|
||||
dest: "/etc/ansible/roles/{{project_name}}"
|
||||
state: link
|
||||
delegate_to: primary
|
||||
|
||||
- name: Clone kubespray
|
||||
git:
|
||||
repo: https://github.com/kubernetes-incubator/kubespray/
|
||||
dest: "/tmp/kubespray"
|
||||
delegate_to: primary
|
||||
|
||||
- name: Clone ansible-role-k8s-tripleo for now
|
||||
become: true
|
||||
git:
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
---
|
||||
- include: pre_rhel.yml
|
||||
when: ansible_os_family == 'RedHat'
|
||||
|
||||
- include: pre_debian.yml
|
||||
when: ansible_os_family == 'Debian'
|
||||
|
||||
- name: Clone kubespray
|
||||
git:
|
||||
repo: https://github.com/kubernetes-incubator/kubespray/
|
||||
dest: "/tmp/kubespray"
|
||||
delegate_to: primary
|
|
@ -0,0 +1 @@
|
|||
---
|
|
@ -0,0 +1,54 @@
|
|||
---
|
||||
- name: Add ASB repo for ansible-kubernetes-modules
|
||||
become: true
|
||||
yum_repository:
|
||||
name: asb
|
||||
description: Copr repo for ansible-service-broker-latest owned by @ansible-service-broker
|
||||
file: asb
|
||||
baseurl: https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/epel-7-$basearch/
|
||||
gpgkey: https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/pubkey.gpg
|
||||
gpgcheck: true
|
||||
enabled: true
|
||||
skip_if_unavailable: true
|
||||
repo_gpgcheck: false
|
||||
|
||||
- name: Enable/Install epel-release/centos-release-openshift-origin
|
||||
become: true
|
||||
yum:
|
||||
name: "{{item}}"
|
||||
state: present
|
||||
with_items:
|
||||
- epel-release
|
||||
- centos-release-openshift-origin
|
||||
|
||||
# NOTE(flaper87): python-openshift requires a specific version of
|
||||
# python-requests. We need to update it to the version in the asb repo, hence
|
||||
# this step. We have to enable epel so we can meet the python2-pysocks
|
||||
# dependency, which is a python-requests requirement.
|
||||
- name: Force update for requests/urllib3
|
||||
become: true
|
||||
yum:
|
||||
name: "{{item}}"
|
||||
state: latest
|
||||
update_cache: true
|
||||
enablerepo: asb,epel
|
||||
disablerepo: centos-openstack-ocata
|
||||
with_items:
|
||||
- python-requests
|
||||
|
||||
- name: Install required packages
|
||||
become: true
|
||||
yum:
|
||||
name: "{{item}}"
|
||||
state: latest
|
||||
with_items:
|
||||
- ansible
|
||||
- python-netaddr
|
||||
|
||||
- name: Install required packages from asb
|
||||
become: true
|
||||
yum:
|
||||
name: "{{item}}"
|
||||
state: latest
|
||||
with_items:
|
||||
- ansible-kubernetes-modules
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
- name: Build inventory
|
||||
template:
|
||||
src: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}/tests/roles/kubernetes/templates/inventory.j2"
|
||||
dest: "/tmp/kubespray/ci_inventory"
|
||||
delegate_to: "primary"
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
|
||||
ansible-playbook -i ci_inventory --skip-tags bastion-ssh-config -e skip_downloads=true cluster.yml
|
||||
executable: /bin/bash
|
||||
chdir: "/tmp/kubespray"
|
||||
delegate_to: "primary"
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
register: kubespray_output
|
|
@ -1,7 +1,5 @@
|
|||
---
|
||||
- hosts: all
|
||||
vars:
|
||||
project_name: ansible-role-k8s-mariadb
|
||||
tasks:
|
||||
- set_fact:
|
||||
nodes: |
|
||||
|
@ -9,29 +7,13 @@
|
|||
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} ansible_become=true ansible_user={{ hostvars[host]['ansible_user'] }}
|
||||
{% endfor %}
|
||||
|
||||
- name: Build inventory
|
||||
template:
|
||||
src: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}/tests/templates/inventory.j2"
|
||||
dest: "/tmp/kubespray/ci_inventory"
|
||||
delegate_to: "primary"
|
||||
|
||||
- name: Build playbook
|
||||
template:
|
||||
src: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}/tests/templates/playbook.j2"
|
||||
dest: "{{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/playbook.yml"
|
||||
delegate_to: "primary"
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
|
||||
ansible-playbook -i ci_inventory --skip-tags bastion-ssh-config -e skip_downloads=true cluster.yml
|
||||
executable: /bin/bash
|
||||
chdir: "/tmp/kubespray"
|
||||
delegate_to: "primary"
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
register: kubespray_output
|
||||
- include: 'roles/{{coe}}/tasks/run.yml'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
|
|
Loading…
Reference in New Issue