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 cbfa8c4b8..7166dae0f 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 deps= -r{toxinidir}/tests/requirements.txt diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index ba68e3ff3..6ba54ca77 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 e03a6554f..e199115b8 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 7f60efb9d..9297e3554 100644 --- 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