From 4a9007ce3c509119242fb6d4bd7d243052c61e39 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 31 Mar 2020 14:08:30 +0200 Subject: [PATCH] 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 (cherry picked from commit 9219991441ba4205234d904cc45f06fdd257e1ba) --- Vagrantfile | 2 +- infrastructure-playbooks/purge-docker-cluster.yml | 1 - site-docker.yml.sample | 1 - tox-external_clients.ini | 2 +- tox-filestore_to_bluestore.ini | 2 +- tox-update.ini | 2 +- tox.ini | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) delete mode 120000 infrastructure-playbooks/purge-docker-cluster.yml delete mode 120000 site-docker.yml.sample diff --git a/Vagrantfile b/Vagrantfile index 9493a3873..1398c4c9f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -39,7 +39,7 @@ $last_ip_cluster_digit = 9 ansible_provision = proc do |ansible| if DOCKER then - ansible.playbook = 'site-docker.yml' + ansible.playbook = 'site-container.yml' if settings['skip_tags'] ansible.skip_tags = settings['skip_tags'] end diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml deleted file mode 120000 index 0d30f194d..000000000 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ /dev/null @@ -1 +0,0 @@ -purge-container-cluster.yml \ No newline at end of file diff --git a/site-docker.yml.sample b/site-docker.yml.sample deleted file mode 120000 index 16aae02fc..000000000 --- a/site-docker.yml.sample +++ /dev/null @@ -1 +0,0 @@ -site-container.yml.sample \ No newline at end of file diff --git a/tox-external_clients.ini b/tox-external_clients.ini index 534f27aed..c8669e614 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -28,7 +28,7 @@ setenv= ubuntu: _INVENTORY = hosts-ubuntu INVENTORY = {env:_INVENTORY:hosts} container: CONTAINER_DIR = /container - container: PLAYBOOK = site-docker.yml.sample + container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample non_container: CEPH_STABLE_RELEASE = octopus diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index 444e2014d..f9615b2c5 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -28,7 +28,7 @@ setenv= ubuntu: _INVENTORY = hosts-ubuntu INVENTORY = {env:_INVENTORY:hosts} container: CONTAINER_DIR = /container - container: PLAYBOOK = site-docker.yml.sample + container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample non_container: DEV_SETUP = True diff --git a/tox-update.ini b/tox-update.ini index 7c2743858..8e09be8fe 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -28,7 +28,7 @@ setenv= ubuntu: _INVENTORY = hosts-ubuntu INVENTORY = {env:_INVENTORY:hosts} container: CONTAINER_DIR = /container - container: PLAYBOOK = site-docker.yml.sample + container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master diff --git a/tox.ini b/tox.ini index 0244b4e35..0aeeca679 100644 --- a/tox.ini +++ b/tox.ini @@ -359,7 +359,7 @@ setenv= ubuntu: _INVENTORY = hosts-ubuntu INVENTORY = {env:_INVENTORY:hosts} container: CONTAINER_DIR = /container - container: PLAYBOOK = site-docker.yml.sample + container: PLAYBOOK = site-container.yml.sample container: PURGE_PLAYBOOK = purge-container-cluster.yml non_container: PLAYBOOK = site.yml.sample shrink_mds: MDS_TO_KILL = mds0