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>

diff --git a/Vagrantfile b/Vagrantfile
index 9493a3873225d4048b84bb1b166d2bbbf4293973..1398c4c9f0c66202ae354c01a6ec6b1097189155 100644 (file)
--- 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 (symlink)
index 0d30f19..0000000
--- 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 (symlink)
index 16aae02..0000000
--- 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 cbfa8c4b8e2fe414984210146d8949e2fa8a47c2..7166dae0f5cf4e4cd3518d40cab130e150f31da3 100644 (file)
--- 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
 
 deps= -r{toxinidir}/tests/requirements.txt

diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini
index ba68e3ff354a8a3bb447d213fb6f5c41ff135a18..6ba54ca77b86c8bd6d9f642877d0ea7ab3bb9da5 100644 (file)
--- 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 e03a6554fbbf5f71b11eb577c847f1692007c9ac..e199115b854be46b9a0102a41520932019d9a300 100644 (file)
--- 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 7f60efb9dcf4f880209136ef8f910648288fc89a..9297e35542ae37f67614462c849436dcd4ed37e4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -300,7 +300,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