openstack/openstack-helm
Code Issues Proposed changes

Merge "Move back to ceph mimic packages"

Browse Source
This commit is contained in:
Zuul 2019-03-20 19:14:11 +00:00 committed by Gerrit Code Review
commit 8507ef92f4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deployment/common/005-deploy-k8s.sh
View File

@ -59,9 +59,7 @@ sudo sed -i '/^::1/c\::1 localhost6 localhost6.localdomain6' /etc/hosts
# Install required packages for K8s on host
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 460F3994
RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}')
#NOTE (srwilkers): Use the luminous repository until the issues with the mimic
# repository are sorted out
sudo add-apt-repository "deb https://download.ceph.com/debian-luminous/
sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/
${RELEASE_NAME} main"
sudo -E apt-get update
# NOTE(srwilkers): Pin docker version to validated docker version for k8s 1.12.2

2
tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
View File

@ -23,7 +23,7 @@
- name: ubuntu | ensure community ceph repository exists
when: ansible_distribution == 'Ubuntu'
apt_repository:
repo: "deb https://download.ceph.com/debian-luminous/ {{ ansible_lsb.codename }} main"
repo: "deb https://download.ceph.com/debian-mimic/ {{ ansible_lsb.codename }} main"
state: present
update_cache: yes