mirror of https://github.com/ceph/ceph-ansible.git
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
parent
5272a0d1fc
commit
4a9007ce3c
|
@ -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
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
purge-container-cluster.yml
|
|
@ -1 +0,0 @@
|
|||
site-container.yml.sample
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
2
tox.ini
2
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
|
||||
|
|
Loading…
Reference in New Issue