summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Miller <admiller@redhat.com>2016-04-15 13:23:45 +0000
committerAdam Miller <admiller@redhat.com>2016-04-15 13:23:45 +0000
commitdee604f1becbf8366deeded98be66a2476b85920 (patch)
tree3ce99def504cf668200466225a418e24203e14c4
parentd07ca3422018457c1bb15048f2112c723cc4ab3d (diff)
downloadansible-dee604f1becbf8366deeded98be66a2476b85920.tar.gz
ansible-dee604f1becbf8366deeded98be66a2476b85920.tar.xz
ansible-dee604f1becbf8366deeded98be66a2476b85920.zip
osbs-master: use docker-storage-setup
Signed-off-by: Adam Miller <admiller@redhat.com>
-rw-r--r--playbooks/groups/osbs-master.yml23
1 files changed, 7 insertions, 16 deletions
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 6645d5f4b..5023cca05 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -40,6 +40,11 @@
tasks:
- include: "{{tasks}}/osbs_repos.yml"
+ - name: copy docker-storage-setup config
+ copy:
+ src: "{{files}}/osbs/docker-storage-setup"
+ dest: "/etc/sysconfig/docker-storage-setup"
+
- name: create cert dir for openshift public facing REST API SSL
file:
path: "/etc/origin/master/named_certificates"
@@ -226,18 +231,6 @@
dest: "{{ koji_ca_cert_path }}"
notify: oc secrets new
- - name: setup logical volume for docker cache
- lvol:
- vg: "vg-docker"
- lv: "metadata"
- size: "4g"
-
- - name: setup logical volume for docker data storage
- lvol:
- vg: "vg-docker"
- lv: "data"
- size: "55g"
-
- name: install docker
action: "{{ ansible_pkg_mgr }} name=docker state=installed"
@@ -256,10 +249,8 @@
src: "{{private}}/files/koji/containerbuild.key.pem"
dest: "{{docker_cert_dir}}/client.key"
- - name: copy docker storage config
- copy:
- src: "{{files}}/osbs/docker-storage"
- dest: "/etc/sysconfig/docker-storage"
+ - name: run docker-storage-setup
+ shell: "docker-storage-setup"
- name: start and enable docker
service: name=docker state=started enabled=yes