Skip to content

Commit

Permalink
Merge pull request #601 from npawelek/INSIGHTS-306
Browse files Browse the repository at this point in the history
Add type to deploy_osp option in ceph_osd_host_facts module
  • Loading branch information
tonytan4ever authored Dec 21, 2018
2 parents d8bc795 + aaecc91 commit 5d0c75c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
3 changes: 2 additions & 1 deletion playbooks/library/ceph_osd_host_facts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def main():
),
deploy_osp=dict(
required=False,
default=False
default=False,
type='bool'
)
),
supports_check_mode=False
Expand Down
6 changes: 3 additions & 3 deletions playbooks/maas-ceph-osd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- name: Include OSP vars
include_vars: vars/maas-osp.yml
when:
- deploy_osp | default(False)
- deploy_osp | default(False)

- include: "common-tasks/maas_excluded_regex.yml"
- name: Set the current group
Expand Down Expand Up @@ -56,7 +56,7 @@
- deploy_osp | default(False)
register: osd_container_name

- name: Set container name for osp template
- name: Set container name for osp template
set_fact:
container_name: "{{ osd_container_name.stdout | trim }}"
when:
Expand All @@ -67,7 +67,7 @@
ceph_osd_host_facts:
hostname: "{{ ansible_hostname }}"
container_name: "{{ container_name | default(inventory_hostname) }}"
deploy_osp: "{{ deploy_osp | default(False) }}"
deploy_osp: "{{ deploy_osp | default(False) }}"
tags:
- always

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
Add boolean type for deploy_osp in custom OSD fact gathering module.

0 comments on commit 5d0c75c

Please sign in to comment.