Remove Trusty support from ceph_client role
Change-Id: I8a1fed14bd1107c6557c7e4a1c1bdce840a1160a Implements: blueprint trusty-removal
This commit is contained in:
parent
4a096dfab5
commit
c7b17d4b0d
|
@ -3,15 +3,6 @@ Vagrant.configure(2) do |config|
|
|||
v.memory = 2048
|
||||
v.cpus = 2
|
||||
end
|
||||
config.vm.define "ubuntu1404" do |trusty|
|
||||
trusty.vm.box = "ubuntu/trusty64"
|
||||
trusty.vm.provision "shell", inline: <<-SHELL
|
||||
sudo su -
|
||||
cd /vagrant
|
||||
apt-get update
|
||||
./run_tests.sh
|
||||
SHELL
|
||||
end
|
||||
|
||||
config.vm.define "ubuntu1604" do |xenial|
|
||||
xenial.vm.box = "ubuntu/xenial64"
|
||||
|
|
|
@ -32,7 +32,7 @@ libselinux-python [platform:rpm]
|
|||
# For SSL SNI support
|
||||
python-pyasn1 [platform:dpkg]
|
||||
python-openssl [platform:dpkg]
|
||||
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty]
|
||||
python-ndg-httpsclient [platform:ubuntu]
|
||||
python2-pyasn1 [platform:rpm]
|
||||
pyOpenSSL [platform:rpm]
|
||||
python-ndg_httpsclient [platform:rpm]
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
service:
|
||||
name: "{{ item.1 }}"
|
||||
state: restarted
|
||||
pattern: "{{ item.1 }}"
|
||||
with_subelements:
|
||||
- "{{ ceph_components }}"
|
||||
- service
|
||||
|
|
|
@ -22,7 +22,6 @@ galaxy_info:
|
|||
platforms:
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
- trusty
|
||||
- xenial
|
||||
- name: EL
|
||||
versions:
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
---
|
||||
# Copyright 2016 IBM Corp
|
||||
# Copyright 2015, Serge van Ginderachter <serge@vanginderachter.be>
|
||||
#
|
||||
# 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.
|
||||
|
||||
## APT Cache Options
|
||||
cache_timeout: 600
|
||||
|
||||
# Ceph GPG Keys
|
||||
ceph_gpg_keys:
|
||||
- key_name: 'ceph'
|
||||
keyserver: 'hkp://keyserver.ubuntu.com:80'
|
||||
fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
|
||||
hash_id: '0xe84ac2c0460f3994'
|
||||
|
||||
# The apt-key command won't del a key when you give it the hash_id, so we have
|
||||
# to use the short key ID here instead.
|
||||
ceph_revoked_gpg_keys:
|
||||
- '17ED316D'
|
||||
|
||||
# Ceph.com repository variables
|
||||
ceph_apt_repo_url_region: "download" # or "eu" for Netherlands based mirror
|
||||
ceph_stable_release: hammer
|
||||
ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}/"
|
||||
|
||||
# Ubuntu Cloud Archive variables
|
||||
# There are no UCA packages for Trusty beyond Mitaka, so the selected
|
||||
# release here has to remain at Mitaka.
|
||||
uca_openstack_release: mitaka
|
||||
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
|
||||
|
||||
# Apt repositories
|
||||
ceph_apt_repos:
|
||||
ceph:
|
||||
repo: "deb {{ ceph_apt_repo_url }} {{ ansible_lsb.codename }} main"
|
||||
state: "present"
|
||||
uca:
|
||||
repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
|
||||
state: "present"
|
Loading…
Reference in New Issue