summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-01 15:45:45 +0200
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-01 15:45:45 +0200
commitb8dcab08624bfdc4e89a144b82caa68883d1f861 (patch)
treeef0056ba5d90c5a3b58cf2b285d4e84bd53d4b99 /roles/openshift_node/tasks
parent9229927a98389f0dae2abb51e1df971f9457afb3 (diff)
downloadopenshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.gz
openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.bz2
openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.xz
openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.zip
Removed some application specific code like insecure registries, heat template
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 7e5ac2b5b..96cd96315 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -73,12 +73,6 @@
dest: /etc/sysconfig/docker
regexp: '^OPTIONS=.*$'
line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} \
---insecure-registry=dockerhub.rnd.amadeus.net:5000 \
---insecure-registry=dockerhub.rnd.amadeus.net:5001 \
---insecure-registry=dockerhub.rnd.amadeus.net:5002 \
---add-registry=dockerhub.rnd.amadeus.net:5000 \
---add-registry=dockerhub.rnd.amadeus.net:5001 \
---add-registry=dockerhub.rnd.amadeus.net:5002 \
{% if ansible_selinux and ansible_selinux.status == '''enabled''' %}--selinux-enabled{% endif %}'"
when: docker_check.stat.isreg
notify: