Strip away containerized_deployment

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml
index 8e9e804503fd0f8b16c8c427b4d77c8dc8d3d1c5..f7ec6d9f38016eeeb93ae4b8c6bd9907113a7ef7 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/main.yml
+++ b/ansible/roles/ceph-collectd/tasks/main.yml
@@ -8,14 +8,11 @@
   when: backend.metrics != 'cephmetrics'
 
 - include: setup_repos.yml
-  when:
-    - not containerized_deployment
   tags:
     - packages
     - repos
 
 - include: install_packages.yml
-  when: not containerized_deployment
   tags:
     - packages
 
@@ -25,19 +22,16 @@
 
 - include: install_collectd_plugins.yml
   when:
-    - not containerized_deployment
     - devel_mode
   tags:
     - collectors
 
 - include: configure_collectd.yml
-  when: not containerized_deployment
   tags:
     - collectors
 
 - include: selinux.yml
   when:
-   - not containerized_deployment
    - ansible_pkg_mgr == "yum"
    - ansible_selinux.status is defined
    - ansible_selinux.status == 'enabled'
@@ -45,6 +39,5 @@
     - selinux
 
 - include: start_collectd.yml
-  when: not containerized_deployment
   tags:
     - services

diff --git a/ansible/roles/ceph-graphite/tasks/main.yml b/ansible/roles/ceph-graphite/tasks/main.yml
index 96748e6fdb8a263a7c5d30a20388c569eec3a77d..9791929ac3fd60da85649267a01a07df71ae1f32 100644 (file)
--- a/ansible/roles/ceph-graphite/tasks/main.yml
+++ b/ansible/roles/ceph-graphite/tasks/main.yml
@@ -8,7 +8,6 @@
   when: backend.storage != 'graphite'
 
 - include: install_packages.yml
-  when: not containerized_deployment
   tags:
     - packages
 
@@ -17,12 +16,10 @@
     - firewall
 
 - include: configure_carbon.yml
-  when: not containerized_deployment
   tags:
     - carbon
 
 - include: configure_graphite.yml
-  when: not containerized_deployment
   tags:
     - graphite
 
@@ -36,6 +33,5 @@
     - services
 
 - include: start_services.yml
-  when: not containerized_deployment
   tags:
     - services

diff --git a/ansible/roles/cephmetrics-common/defaults/main.yml b/ansible/roles/cephmetrics-common/defaults/main.yml
index 0f2287d1dc6cc0190730bd845e252ffead403954..d7d135c5ab7071871448b326409fc3a33fb3299e 100644 (file)
--- a/ansible/roles/cephmetrics-common/defaults/main.yml
+++ b/ansible/roles/cephmetrics-common/defaults/main.yml
@@ -1,10 +1,9 @@
 ---
 defaults:
-  containerized: false
+  containerized: true
   backend:
     metrics: mgr  # mgr, cephmetrics
     storage: prometheus  # prometheus, graphite
-  containerized_deployment: false
   use_epel: false
   devel_mode: true
   graphite:

diff --git a/ansible/roles/cephmetrics-common/tasks/main.yml b/ansible/roles/cephmetrics-common/tasks/main.yml
index 258d8d86323f51cfc184e857f229962a9c9625c3..d5e7e33e52cf5dd2dd45fac6958c3d283c577b5e 100644 (file)
--- a/ansible/roles/cephmetrics-common/tasks/main.yml
+++ b/ansible/roles/cephmetrics-common/tasks/main.yml
@@ -4,8 +4,6 @@
     - always
 
 - include: setup_repos.yml
-  when:
-    - not containerized_deployment
   tags:
     - packages
     - repos