summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-04-20 16:39:52 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-04-21 00:04:44 -0400
commit656cb873f4a07eefaf7f1180e79378a30af03de0 (patch)
tree24964a42b478a7b3bebe1ca094304463e38d81ce
parent96dd0ab929b7f391eee9b23209aa377537114b72 (diff)
downloadopenshift-656cb873f4a07eefaf7f1180e79378a30af03de0.tar.gz
openshift-656cb873f4a07eefaf7f1180e79378a30af03de0.tar.bz2
openshift-656cb873f4a07eefaf7f1180e79378a30af03de0.tar.xz
openshift-656cb873f4a07eefaf7f1180e79378a30af03de0.zip
openshift-sdn-node fix to use /etc/sysconfig/docker-network
-rw-r--r--roles/openshift_sdn_node/tasks/main.yml21
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