ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove *docker*.yml symlinks 

This commits removes these two symlinks.
They were there for backward compatibility and were marked deprecated as
of stable-4.0

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 9219991441)
pull/5222/head
Guillaume Abrioux 2020-03-31 14:08:30 +02:00 committed by Dimitri Savineau
parent 5272a0d1fc
commit 4a9007ce3c
7 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -39,7 +39,7 @@ $last_ip_cluster_digit = 9
ansible_provision = proc do |ansible| ansible_provision = proc do |ansible|
if DOCKER then if DOCKER then
ansible.playbook = 'site-docker.yml' ansible.playbook = 'site-container.yml'
if settings['skip_tags'] if settings['skip_tags']
ansible.skip_tags = settings['skip_tags'] ansible.skip_tags = settings['skip_tags']
end end

1
infrastructure-playbooks/purge-docker-cluster.yml
View File

@ -1 +0,0 @@
purge-container-cluster.yml

1
site-docker.yml.sample
View File

@ -1 +0,0 @@
site-container.yml.sample

2
tox-external_clients.ini
View File

@ -28,7 +28,7 @@ setenv=
ubuntu: _INVENTORY = hosts-ubuntu ubuntu: _INVENTORY = hosts-ubuntu
INVENTORY = {env:_INVENTORY:hosts} INVENTORY = {env:_INVENTORY:hosts}
container: CONTAINER_DIR = /container container: CONTAINER_DIR = /container
container: PLAYBOOK = site-docker.yml.sample container: PLAYBOOK = site-container.yml.sample
non_container: PLAYBOOK = site.yml.sample non_container: PLAYBOOK = site.yml.sample
non_container: CEPH_STABLE_RELEASE = octopus non_container: CEPH_STABLE_RELEASE = octopus

2
tox-filestore_to_bluestore.ini
View File

@ -28,7 +28,7 @@ setenv=
ubuntu: _INVENTORY = hosts-ubuntu ubuntu: _INVENTORY = hosts-ubuntu
INVENTORY = {env:_INVENTORY:hosts} INVENTORY = {env:_INVENTORY:hosts}
container: CONTAINER_DIR = /container container: CONTAINER_DIR = /container
container: PLAYBOOK = site-docker.yml.sample container: PLAYBOOK = site-container.yml.sample
non_container: PLAYBOOK = site.yml.sample non_container: PLAYBOOK = site.yml.sample
non_container: DEV_SETUP = True non_container: DEV_SETUP = True

2
tox-update.ini
View File

@ -28,7 +28,7 @@ setenv=
ubuntu: _INVENTORY = hosts-ubuntu ubuntu: _INVENTORY = hosts-ubuntu
INVENTORY = {env:_INVENTORY:hosts} INVENTORY = {env:_INVENTORY:hosts}
container: CONTAINER_DIR = /container container: CONTAINER_DIR = /container
container: PLAYBOOK = site-docker.yml.sample container: PLAYBOOK = site-container.yml.sample
non_container: PLAYBOOK = site.yml.sample non_container: PLAYBOOK = site.yml.sample
UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master

2
tox.ini
View File

@ -359,7 +359,7 @@ setenv=
ubuntu: _INVENTORY = hosts-ubuntu ubuntu: _INVENTORY = hosts-ubuntu
INVENTORY = {env:_INVENTORY:hosts} INVENTORY = {env:_INVENTORY:hosts}
container: CONTAINER_DIR = /container container: CONTAINER_DIR = /container
container: PLAYBOOK = site-docker.yml.sample container: PLAYBOOK = site-container.yml.sample
container: PURGE_PLAYBOOK = purge-container-cluster.yml container: PURGE_PLAYBOOK = purge-container-cluster.yml
non_container: PLAYBOOK = site.yml.sample non_container: PLAYBOOK = site.yml.sample
shrink_mds: MDS_TO_KILL = mds0 shrink_mds: MDS_TO_KILL = mds0