ceph-container-engine: allow override container_package_name and container_service_name

Only include specific variables when they are undefined

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 95bce32270c7f5ea7e397588340b674efd7db63f)

diff --git a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
index baa373bfce5d4deaa318a72f2314d4d3ade5a138..479856d841389eab2590f7292b20e81c6fc8bbca 100644 (file)
--- a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
+++ b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
@@ -4,6 +4,7 @@
   with_first_found:
     - "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml"
     - "{{ ansible_facts['os_family'] }}.yml"
+  when: container_package_name is undefined and container_service_name is undefined
 
 - name: debian based systems tasks
   include_tasks: debian_prerequisites.yml

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index ae989b0fc97fc9bc6b2ba896d2ed468eadca8310..ede4cdb68d5b19dbf2a5cdc2a038db2e91fec8d0 100644 (file)
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -225,6 +225,13 @@
     - (ceph_docker_registry_username is not defined or ceph_docker_registry_password is not defined) or
       (ceph_docker_registry_username | length == 0 or ceph_docker_registry_password | length == 0)
 
+- name: validate container service and container package
+  fail:
+    msg: 'both container_package_name and container_service_name should be defined'
+  when:
+    - (container_package_name is undefined and container_service_name is defined) or
+      (container_package_name is defined and container_service_name is undefined)
+
 - name: check virtual_ips is defined
   fail:
     msg: "virtual_ips is not defined."