Merge pull request #715 from rootfs/jewel

some fixes to run containers on Atomic
ceph · Apr 15, 2016 · 9174ea2 · 9174ea2
2 parents f515485 + 9d81f32
commit 9174ea2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@ -44,7 +44,7 @@
 - name: generate systemd unit file
   become: true
   template:
-    src: ../templates/ceph-mon.service.j2
+    src: "{{ playbook_dir }}/roles/ceph-mon/templates/ceph-mon.service.j2"
     dest: /var/lib/ceph/ceph-mon@.service
     owner: "root"
     group: "root"

diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
@@ -107,7 +107,7 @@
 - name: generate systemd unit file
   become: true
   template:
-    src: ceph-osd.service.j2
+    src: "{{ playbook_dir }}/roles/ceph-osd/templates/ceph-osd.service.j2"
     dest: /var/lib/ceph/ceph-osd@.service
     owner: "root"
     group: "root"

diff --git a/vagrant_variables.yml.atomic b/vagrant_variables.yml.atomic
@@ -1,4 +1,6 @@
 ---
+# DEPLOY CONTAINERIZED DAEMONS
+docker: true
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1