diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml index f804a1908..78f131f87 100644 --- a/tests/functional/rhcs_setup.yml +++ b/tests/functional/rhcs_setup.yml @@ -80,6 +80,22 @@ - name: set MTU on eth1 command: "ifconfig eth1 mtu 1400 up" + - name: install docker + package: + name: docker + state: present + when: ansible_os_family == 'RedHat' + + - name: allow insecure docker registries + lineinfile: + line: 'INSECURE_REGISTRY="--insecure-registry {{ ceph_docker_registry }}"' + dest: "/etc/sysconfig/docker" + + - name: restart docker + service: + name: docker + state: restarted + - hosts: mons:mgrs gather_facts: false become: yes diff --git a/tox.ini b/tox.ini index ea3695743..9725c7415 100644 --- a/tox.ini +++ b/tox.ini @@ -88,7 +88,7 @@ commands= vagrant up --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} - rhcs: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" + rhcs: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \