diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-04-21 16:49:50 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-04-21 16:49:50 -0400 |
| commit | 1f9c84c2ac6ecb044b1ec5be4c21d864b20e996d (patch) | |
| tree | 0981e985ab1e1636141c342e0214ce8f4ea689ca | |
| parent | f1bb251f0cc4dafc7c027f5b9cde1e70a4fbec5a (diff) | |
| parent | 656cb873f4a07eefaf7f1180e79378a30af03de0 (diff) | |
| download | openshift-1f9c84c2ac6ecb044b1ec5be4c21d864b20e996d.tar.gz openshift-1f9c84c2ac6ecb044b1ec5be4c21d864b20e996d.tar.bz2 openshift-1f9c84c2ac6ecb044b1ec5be4c21d864b20e996d.tar.xz openshift-1f9c84c2ac6ecb044b1ec5be4c21d864b20e996d.zip | |
Merge pull request #170 from detiber/docker-network
openshift-sdn-node fix to use /etc/sysconfig/docker-network
| -rw-r--r-- | roles/openshift_sdn_node/tasks/main.yml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/roles/openshift_sdn_node/tasks/main.yml b/roles/openshift_sdn_node/tasks/main.yml index c2329dd6f..37a30d019 100644 --- a/roles/openshift_sdn_node/tasks/main.yml +++ b/roles/openshift_sdn_node/tasks/main.yml @@ -34,12 +34,25 @@ line: '\1"{{ openshift_sdn_master_url }}"' - regex: '^(MINION_IP=)' line: '\1"{{ openshift.common.ip }}"' - # TODO lock down the insecure-registry config to a more sane value than - # 0.0.0.0/0 - - regex: '^(DOCKER_OPTIONS=)' - line: '\1"--insecure-registry=0.0.0.0/0 -b=lbr0 --mtu=1450 --selinux-enabled"' notify: restart openshift-sdn-node +- name: Ensure we aren't setting DOCKER_OPTIONS in /etc/sysconfig/openshift-sdn-node + lineinfile: + dest: /etc/sysconfig/openshift-sdn-node + regexp: '^DOCKER_OPTIONS=' + state: absent + notify: restart openshift-sdn-node + +# TODO lock down the insecure-registry config to a more sane value than +# 0.0.0.0/0 +- name: Configure docker insecure-registry setting + lineinfile: + dest: /etc/sysconfig/docker + regexp: INSECURE_REGISTRY= + line: INSECURE_REGISTRY='--insecure-registry=0.0.0.0/0' + notify: restart openshift-sdn-node + + - name: Start and enable openshift-sdn-node service: name: openshift-sdn-node |