summaryrefslogtreecommitdiffstats
path: root/roles/atomic_proxy/tasks/main.yml
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2014-12-15 16:07:19 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2014-12-15 16:07:19 -0500
commit9830202b133db241493ca3f3d914e1cb1de35963 (patch)
tree0bb33e5ee852ea533f1f808a8e86e38c97699bb4 /roles/atomic_proxy/tasks/main.yml
parent2848232bdaed44fadb51548fe9d6c39fe89b8e11 (diff)
parent023f92f9e3eec7de6c1286549000be79189a4fde (diff)
downloadopenshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.gz
openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.bz2
openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.xz
openshift-9830202b133db241493ca3f3d914e1cb1de35963.zip
Merge pull request #36 from twiest/pr
changed atomic proxy to use pre-built container images
Diffstat (limited to 'roles/atomic_proxy/tasks/main.yml')
-rw-r--r--roles/atomic_proxy/tasks/main.yml20
1 files changed, 1 insertions, 19 deletions
diff --git a/roles/atomic_proxy/tasks/main.yml b/roles/atomic_proxy/tasks/main.yml
index d5a5a0a47..073a1c61e 100644
--- a/roles/atomic_proxy/tasks/main.yml
+++ b/roles/atomic_proxy/tasks/main.yml
@@ -1,21 +1,3 @@
---
-- name: upload sbin scripts
- copy: >
- src={{ item }}
- dest=/usr/local/sbin/{{ item }}
- mode=0750
- with_items:
- - setup-proxy-containers.sh
-
-- name: upload /usr/local/etc files
- copy: >
- src={{ item }}
- dest=/usr/local/etc/{{ item }}
- mode=0640
- with_items:
- - proxy_containers_deploy_descriptor.json
- - ctr-proxy-1.service
- - ctr-proxy-puppet-1.service
- - ctr-proxy-monitoring-1.service
-
- include: setup_puppet.yml
+- include: setup_containers.yml