diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-10-05 12:53:10 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-12-15 15:45:45 -0500 |
| commit | 8e7c5c970b8adc83fd6d5cad115f4edb06b36d98 (patch) | |
| tree | 408ffd1864ae9cd34ef238d5c5a9ff2aa59193d9 /roles/openshift_docker | |
| parent | a0b6fc7db1be2cf6190d982f90e96f4c39a4c699 (diff) | |
| download | openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.tar.gz openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.tar.bz2 openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.tar.xz openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.zip | |
Containerization work by @sdodson
Diffstat (limited to 'roles/openshift_docker')
| -rw-r--r-- | roles/openshift_docker/meta/main.yml | 16 | ||||
| -rw-r--r-- | roles/openshift_docker/tasks/main.yml | 27 |
2 files changed, 43 insertions, 0 deletions
diff --git a/roles/openshift_docker/meta/main.yml b/roles/openshift_docker/meta/main.yml new file mode 100644 index 000000000..1e8f8b719 --- /dev/null +++ b/roles/openshift_docker/meta/main.yml @@ -0,0 +1,16 @@ +--- +galaxy_info: + author: Jason DeTiberus + description: OpenShift Docker + company: Red Hat, Inc. + license: Apache License, Version 2.0 + min_ansible_version: 1.9 + platforms: + - name: EL + versions: + - 7 + categories: + - cloud +dependencies: +- { role: openshift_common } +- { role: docker } diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml new file mode 100644 index 000000000..f63b3acd5 --- /dev/null +++ b/roles/openshift_docker/tasks/main.yml @@ -0,0 +1,27 @@ +--- +- openshift_facts: + - role: common + local_facts: + deployment_type: "{{ openshift_deployment_type }}" + docker_additional_registries: "{{ docker_additional_registries | oo_split() }}" + docker_insecure_registries: "{{ docker_insecure_registries | oo_split() }}" + docker_blocked_registries: "{{ docker_blocked_registries | oo_split() }}" + +- name: Set registry params + lineinfile: + dest: /etc/sysconfig/docker + regexp: '^{{ reg_conf_var }}=.*$' + line: "{{ reg_conf_var }}='{{ reg_fact_val | oo_prepend_strings_in_list(reg_flag ~ ' ') | join(' ') }}'" + when: "'docker_additional_registries' in openshift.common" + with_items: + - reg_conf_var: ADD_REGISTRY + reg_fact_val: {{ openshift.common.docker_additional_registries }} + reg_flag: --add-registry + - reg_conf_var: BLOCK_REGISTRY + reg_fact_val: {{ openshift.common.docker_blocked_registries }} + reg_flag: --block-registry + - reg_conf_var: INSECURE_REGISTRY + reg_fact_val: {{ openshift.common.docker_insecure_registries }} + reg_flag: --insecure-registry + notify: + - restart docker |