ci: do not use atomic host for ansible2.2-docker_dedicated_journal

Switch to CentOS since Atomic host does not have the right Docker
version.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1287/head
Sébastien Han 2017-02-21 15:39:42 -05:00
parent 55bde0336f
commit 51b759fc16
1 changed files with 5 additions and 15 deletions

View File

@ -36,15 +36,11 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# #
# * ceph/ubuntu-xenial # * ceph/ubuntu-xenial
# #
# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 # NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5
# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet # which is not available in Atomic Host.
# libvirt CentOS: centos/7 # There are bug like this one: https://github.com/docker/docker/issues/12694
# parallels Ubuntu: parallels/ubuntu-14.04 vagrant_box: centos/7
# 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
#ssh_private_key_path: "~/.ssh/id_rsa" #ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box # 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 # 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 # Disables synced folder creation. Not needed for testing, will skip mounting
# the vagrant directory on the remote box regardless of the provider. # the vagrant directory on the remote box regardless of the provider.
vagrant_disable_synced_folder: true 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