tests: allow for insecure docker registries when testing rhcs

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml
index f804a1908bd7726d314af4d9756d4d10a4fab976..78f131f876535d33342d83df44427b92712fda24 100644 (file)
--- 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 ea3695743d980b62e4a66e304a05f3d64b3a5d7e..9725c741524184c6bc920352f2a0b84be48c7470 100644 (file)
--- 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} \