diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-16 16:58:54 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-16 16:58:54 -0400 |
| commit | 984f84ce1b19704b16db669593d96153182fc206 (patch) | |
| tree | 4305968d078b65aa4ec13036ec777ceeeaa3ce99 /roles/openshift_docker_facts | |
| parent | bef0ae84568f8bcec002e27a6835c662a5f7c465 (diff) | |
| parent | 84fbacbb0554fcfe425dffd88c83fab96c8c9c2b (diff) | |
| download | openshift-984f84ce1b19704b16db669593d96153182fc206.tar.gz openshift-984f84ce1b19704b16db669593d96153182fc206.tar.bz2 openshift-984f84ce1b19704b16db669593d96153182fc206.tar.xz openshift-984f84ce1b19704b16db669593d96153182fc206.zip | |
Merge pull request #1880 from dgoodwin/registry-insecure
Fixes for openshift_docker_hosted_registry_insecure var.
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 3acd2bba8..0e51fd16f 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -35,7 +35,7 @@ docker_options: > --insecure-registry={{ openshift.docker.hosted_registry_network }} {{ openshift.docker.options | default ('') }} - when: openshift.docker.hosted_registry_insecure | default(False) | bool + when: openshift.docker.hosted_registry_insecure | default(False) | bool and openshift.docker.hosted_registry_network is defined - set_fact: docker_options: "{{ openshift.docker.options | default(omit) }}" |