mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #1490 from ceph/insecure-registry
tests: allow for insecure docker registries when testing rhcspull/1492/head
commit
0af9fee45e
|
@ -80,6 +80,22 @@
|
||||||
- name: set MTU on eth1
|
- name: set MTU on eth1
|
||||||
command: "ifconfig eth1 mtu 1400 up"
|
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
|
- hosts: mons:mgrs
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
become: yes
|
become: yes
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -88,7 +88,7 @@ commands=
|
||||||
vagrant up --no-provision {posargs:--provider=virtualbox}
|
vagrant up --no-provision {posargs:--provider=virtualbox}
|
||||||
bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
|
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 "\
|
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
|
||||||
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
|
||||||
|
|
Loading…
Reference in New Issue