Merge "Install same version for k8s CLIs and k8s control plane services"
This commit is contained in:
commit
de292dfcee
|
@ -58,6 +58,11 @@
|
||||||
# deployment to avoid tests failing of no avaliable pod.
|
# deployment to avoid tests failing of no avaliable pod.
|
||||||
tempest_concurrency: 3
|
tempest_concurrency: 3
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: qinling-tempest-centos7
|
||||||
|
parent: qinling-tempest
|
||||||
|
nodeset: devstack-single-node-centos-7
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -67,3 +72,6 @@
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-lower-constraints
|
- openstack-tox-lower-constraints
|
||||||
|
experimental:
|
||||||
|
jobs:
|
||||||
|
- qinling-tempest-centos7
|
||||||
|
|
|
@ -34,6 +34,7 @@ function base_install {
|
||||||
initscripts \
|
initscripts \
|
||||||
nmap \
|
nmap \
|
||||||
lshw \
|
lshw \
|
||||||
|
screen \
|
||||||
ansible
|
ansible
|
||||||
elif [ "x$HOST_OS" == "xfedora" ]; then
|
elif [ "x$HOST_OS" == "xfedora" ]; then
|
||||||
sudo dnf install -y \
|
sudo dnf install -y \
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
with_items:
|
with_items:
|
||||||
- python
|
- python
|
||||||
- unzip
|
- unzip
|
||||||
- httpie
|
|
||||||
|
|
||||||
- name: Gather facts after python installation
|
- name: Gather facts after python installation
|
||||||
setup: filter=ansible_*
|
setup: filter=ansible_*
|
||||||
|
|
|
@ -6,7 +6,18 @@
|
||||||
baseurl: https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
|
baseurl: https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
|
||||||
enabled: yes
|
enabled: yes
|
||||||
gpgcheck: yes
|
gpgcheck: yes
|
||||||
repo_gpgcheck: yes
|
# Got "repomd.xml signature could not be verified for kubernetes" on zuul
|
||||||
|
repo_gpgcheck: no
|
||||||
gpgkey:
|
gpgkey:
|
||||||
- https://packages.cloud.google.com/yum/doc/yum-key.gpg
|
- https://packages.cloud.google.com/yum/doc/yum-key.gpg
|
||||||
- https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
|
- https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
|
||||||
|
|
||||||
|
- name: Install kube CLIs
|
||||||
|
package:
|
||||||
|
name: "{{ item }}"
|
||||||
|
state: present
|
||||||
|
update_cache: yes
|
||||||
|
with_items:
|
||||||
|
- kubelet-1.9.3
|
||||||
|
- kubectl-1.9.3
|
||||||
|
- kubeadm-1.9.3
|
||||||
|
|
|
@ -7,16 +7,6 @@
|
||||||
when:
|
when:
|
||||||
ansible_pkg_mgr == 'yum'
|
ansible_pkg_mgr == 'yum'
|
||||||
|
|
||||||
- name: Install kube CLIs
|
|
||||||
package:
|
|
||||||
name: "{{ item }}"
|
|
||||||
state: present
|
|
||||||
update_cache: yes
|
|
||||||
with_items:
|
|
||||||
- kubelet
|
|
||||||
- kubeadm
|
|
||||||
- kubectl
|
|
||||||
|
|
||||||
- name: Start kubelet
|
- name: Start kubelet
|
||||||
systemd:
|
systemd:
|
||||||
name: kubelet
|
name: kubelet
|
||||||
|
|
|
@ -8,3 +8,13 @@
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: 'deb http://apt.kubernetes.io/ kubernetes-xenial main'
|
repo: 'deb http://apt.kubernetes.io/ kubernetes-xenial main'
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
|
- name: Install kube CLIs
|
||||||
|
package:
|
||||||
|
name: "{{ item }}"
|
||||||
|
state: present
|
||||||
|
update_cache: yes
|
||||||
|
with_items:
|
||||||
|
- kubelet=1.9.3-00
|
||||||
|
- kubectl=1.9.3-00
|
||||||
|
- kubeadm=1.9.3-00
|
||||||
|
|
Loading…
Reference in New Issue