From 51b759fc16aa5c9d0fd474497a98961a7cbcc6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 21 Feb 2017 15:39:42 -0500 Subject: [PATCH] ci: do not use atomic host for ansible2.2-docker_dedicated_journal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch to CentOS since Atomic host does not have the right Docker version. Signed-off-by: Sébastien Han --- .../vagrant_variables.yml | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml index 0c54f6978..f77870126 100644 --- a/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml +++ b/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml @@ -36,15 +36,11 @@ disks: "[ '/dev/sda', '/dev/sdb' ]" # # * ceph/ubuntu-xenial # -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/atomic-host +# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 +# which is not available in Atomic Host. +# There are bug like this one: https://github.com/docker/docker/issues/12694 +vagrant_box: centos/7 + #ssh_private_key_path: "~/.ssh/id_rsa" # The sync directory changes based on vagrant box # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant @@ -53,9 +49,3 @@ vagrant_box: centos/atomic-host # Disables synced folder creation. Not needed for testing, will skip mounting # the vagrant directory on the remote box regardless of the provider. vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box