From ac5cab0d28ae3e470ef56fb4cc5f208c387cebc3 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 30 Sep 2016 15:57:51 +0100 Subject: [PATCH] Fix clash between common tests repo and repo tests The tests are adjusted so that the central tests repo configuration do not clash with the tests. Change-Id: Id5827e2fa4394c743590993d96f4868332228f62 --- tests/host_vars/container2.yml | 2 +- tests/test-containers-functional.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/host_vars/container2.yml b/tests/host_vars/container2.yml index 121cbde..8ef14f9 100644 --- a/tests/host_vars/container2.yml +++ b/tests/host_vars/container2.yml @@ -4,5 +4,5 @@ lxc_container_config_list: lxc_container_bind_mounts: - host_directory: "/openstack/{{ inventory_hostname }}/test2" - container_directory: "/var/log/test2" + container_directory: "/opt/test2" diff --git a/tests/test-containers-functional.yml b/tests/test-containers-functional.yml index c6865d6..9775111 100644 --- a/tests/test-containers-functional.yml +++ b/tests/test-containers-functional.yml @@ -51,7 +51,7 @@ command: grep "lxc.mount.entry = /openstack/container1 opt/test1 none bind 0 0" /var/lib/lxc/container1/config - name: Check for the presence of the right bound mount for container2 - command: grep "lxc.mount.entry = /openstack/container2/test2 var/log/test2 none bind 0 0" /var/lib/lxc/container2/config + command: grep "lxc.mount.entry = /openstack/container2/test2 opt/test2 none bind 0 0" /var/lib/lxc/container2/config - name: Check for the presence of the default bound mount for container3 command: grep "lxc.mount.entry = /openstack/backup/container3" /var/lib/lxc/container3/config