summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/storage
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles/storage')
-rw-r--r--deploy/adapters/ansible/roles/storage/tasks/ceph.yml18
-rw-r--r--deploy/adapters/ansible/roles/storage/vars/Debian.yml3
-rw-r--r--deploy/adapters/ansible/roles/storage/vars/RedHat.yml3
-rw-r--r--deploy/adapters/ansible/roles/storage/vars/main.yml1
4 files changed, 24 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/storage/tasks/ceph.yml b/deploy/adapters/ansible/roles/storage/tasks/ceph.yml
index 50476c7b..0fc7c80b 100644
--- a/deploy/adapters/ansible/roles/storage/tasks/ceph.yml
+++ b/deploy/adapters/ansible/roles/storage/tasks/ceph.yml
@@ -12,6 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+- include_vars: "{{ ansible_os_family }}.yml"
+
- name: Create sparse ceph OSD files
command: truncate -s {{ host_loopback_ceph_size }} /var/{{ item }}.img
args:
@@ -43,6 +45,7 @@
line: "losetup -f /var/{{ item }}.img"
insertbefore: "{{ rc_local_insert_before }}"
with_items: "{{ ceph_osd_images }}"
+ when: ansible_os_family == 'Debian'
- name: Create ceph partitions at boot time
lineinfile:
@@ -50,3 +53,18 @@
line: "partprobe -s {{ item }}"
insertbefore: "{{ rc_local_insert_before }}"
with_items: "{{ ceph_loopback.results | map(attribute='stdout') | list }}"
+ when: ansible_os_family == 'Debian'
+
+- name: Create ceph loopback at boot time
+ lineinfile:
+ dest: "{{ rc_local }}"
+ line: "losetup -f /var/{{ item }}.img"
+ with_items: "{{ ceph_osd_images }}"
+ when: ansible_os_family == 'RedHat'
+
+- name: Create ceph partitions at boot time
+ lineinfile:
+ dest: "{{ rc_local }}"
+ line: "partprobe -s {{ item }}"
+ with_items: "{{ ceph_loopback.results | map(attribute='stdout') | list }}"
+ when: ansible_os_family == 'RedHat'
diff --git a/deploy/adapters/ansible/roles/storage/vars/Debian.yml b/deploy/adapters/ansible/roles/storage/vars/Debian.yml
new file mode 100644
index 00000000..c1141f7b
--- /dev/null
+++ b/deploy/adapters/ansible/roles/storage/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+
+rc_local: /etc/rc.local
diff --git a/deploy/adapters/ansible/roles/storage/vars/RedHat.yml b/deploy/adapters/ansible/roles/storage/vars/RedHat.yml
new file mode 100644
index 00000000..ef59e1b4
--- /dev/null
+++ b/deploy/adapters/ansible/roles/storage/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+
+rc_local: /etc/rc.d/rc.local
diff --git a/deploy/adapters/ansible/roles/storage/vars/main.yml b/deploy/adapters/ansible/roles/storage/vars/main.yml
index 28e2ad06..cbee9c1e 100644
--- a/deploy/adapters/ansible/roles/storage/vars/main.yml
+++ b/deploy/adapters/ansible/roles/storage/vars/main.yml
@@ -8,7 +8,6 @@
##############################################################################
---
host_loopback_ceph_size: "100G"
-rc_local: /etc/rc.local
rc_local_insert_before: "^exit 0$"
bootstrap_host_data_disk_device: null
bootstrap_host_data_disk_device_force: "no"