Cleanup logging and metrics deprecations

This commit removes old variables, adds them
to sanity checks for failing purposes, and
ensures that various new variables are being used
instead of the old variables.

images/installer/root/etc/inventory-generator-config.yaml

@@ -15,6 +15,6 @@ openshift_deployment_type: origin
 
 openshift_release: 3.6
 openshift_image_tag: v3.6.0
-openshift_hosted_logging_deploy: null  # defaults to "true" if loggingPublicURL is set in master-config.yaml
+openshift_logging_install_logging: null  # defaults to "true" if loggingPublicURL is set in master-config.yaml
 openshift_logging_image_version: v3.6.0
 openshift_disable_check: ""

images/installer/root/usr/local/bin/generate

@@ -298,13 +298,13 @@ def main():
 
     # contains host types (e.g. masters, nodes, etcd)
     host_groups = dict()
-    openshift_hosted_logging_deploy = False
+    openshift_logging_install_logging = False
     is_etcd_deployed = master_config.get("storage-backend", "") in ["etcd3", "etcd2", "etcd"]
 
     if asset_config and asset_config.get('loggingPublicURL'):
-        openshift_hosted_logging_deploy = True
+        openshift_logging_install_logging = True
 
-    openshift_hosted_logging_deploy = user_config.get("openshift_hosted_logging_deploy", openshift_hosted_logging_deploy)
+    openshift_logging_install_logging = user_config.get("openshift_logging_install_logging", openshift_logging_install_logging)
 
     m = Host("masters")
     m.address(master_config["masterIP"])
@@ -382,7 +382,7 @@ def main():
         inv_file_obj.write("openshift_disable_check={}\n".format(str(openshift_disable_check)))
     inv_file_obj.write("\n")
 
-    inv_file_obj.write("openshift_hosted_logging_deploy={}\n".format(str(openshift_hosted_logging_deploy)))
+    inv_file_obj.write("openshift_logging_install_logging={}\n".format(str(openshift_logging_install_logging)))
     inv_file_obj.write("\n")
 
     for group in host_groups:

roles/lib_utils/action_plugins/sanity_checks.py

@@ -69,6 +69,49 @@ REMOVED_VARIABLES = (
     ('openshift_cockpit_deployer_prefix', 'openshift_cockpit_deployer_image'),
     ('openshift_cockpit_deployer_basename', 'openshift_cockpit_deployer_image'),
     ('openshift_cockpit_deployer_version', 'openshift_cockpit_deployer_image'),
+    ('openshift_hosted_logging_elasticsearch_pvc_prefix', 'openshift_logging_es_pvc_prefix'),
+    ('logging_ops_hostname', 'openshift_logging_kibana_ops_hostname'),
+    ('openshift_hosted_logging_ops_hostname', 'openshift_logging_kibana_ops_hostname'),
+    ('openshift_hosted_logging_elasticsearch_cluster_size', 'logging_elasticsearch_cluster_size'),
+    ('openshift_hosted_logging_elasticsearch_ops_cluster_size', 'logging_elasticsearch_ops_cluster_size'),
+    ('openshift_hosted_logging_storage_kind', 'openshift_logging_storage_kind'),
+    ('openshift_hosted_logging_storage_host', 'openshift_logging_storage_host'),
+    ('openshift_hosted_logging_storage_labels', 'openshift_logging_storage_labels'),
+    ('openshift_hosted_logging_storage_volume_size', 'openshift_logging_storage_volume_size'),
+    ('openshift_hosted_loggingops_storage_kind', 'openshift_loggingops_storage_kind'),
+    ('openshift_hosted_loggingops_storage_host', 'openshift_loggingops_storage_host'),
+    ('openshift_hosted_loggingops_storage_labels', 'openshift_loggingops_storage_labels'),
+    ('openshift_hosted_loggingops_storage_volume_size', 'openshift_loggingops_storage_volume_size'),
+    ('openshift_hosted_logging_enable_ops_cluster', 'openshift_logging_use_ops'),
+    ('openshift_hosted_logging_image_pull_secret', 'openshift_logging_image_pull_secret'),
+    ('openshift_hosted_logging_hostname', 'openshift_logging_kibana_hostname'),
+    ('openshift_hosted_logging_kibana_nodeselector', 'openshift_logging_kibana_nodeselector'),
+    ('openshift_hosted_logging_kibana_ops_nodeselector', 'openshift_logging_kibana_ops_nodeselector'),
+    ('openshift_hosted_logging_journal_source', 'openshift_logging_fluentd_journal_source'),
+    ('openshift_hosted_logging_journal_read_from_head', 'openshift_logging_fluentd_journal_read_from_head'),
+    ('openshift_hosted_logging_fluentd_nodeselector_label', 'openshift_logging_fluentd_nodeselector'),
+    ('openshift_hosted_logging_elasticsearch_instance_ram', 'openshift_logging_es_memory_limit'),
+    ('openshift_hosted_logging_elasticsearch_nodeselector', 'openshift_logging_es_nodeselector'),
+    ('openshift_hosted_logging_elasticsearch_ops_nodeselector', 'openshift_logging_es_ops_nodeselector'),
+    ('openshift_hosted_logging_elasticsearch_ops_instance_ram', 'openshift_logging_es_ops_memory_limit'),
+    ('openshift_hosted_logging_storage_access_modes', 'openshift_logging_storage_access_modes'),
+    ('openshift_hosted_logging_master_public_url', 'openshift_logging_master_public_url'),
+    ('openshift_hosted_logging_deployer_prefix', 'openshift_logging_image_prefix'),
+    ('openshift_hosted_logging_deployer_version', 'openshift_logging_image_version'),
+    ('openshift_hosted_logging_deploy', 'openshift_logging_install_logging'),
+    ('openshift_hosted_logging_curator_nodeselector', 'openshift_logging_curator_nodeselector'),
+    ('openshift_hosted_logging_curator_ops_nodeselector', 'openshift_logging_curator_ops_nodeselector'),
+    ('openshift_hosted_metrics_storage_access_modes', 'openshift_metrics_storage_access_modes'),
+    ('openshift_hosted_metrics_storage_host', 'openshift_metrics_storage_host'),
+    ('openshift_hosted_metrics_storage_nfs_directory', 'openshift_metrics_storage_nfs_directory'),
+    ('openshift_hosted_metrics_storage_volume_name', 'openshift_metrics_storage_volume_name'),
+    ('openshift_hosted_metrics_storage_volume_size', 'openshift_metrics_storage_volume_size'),
+    ('openshift_hosted_metrics_storage_labels', 'openshift_metrics_storage_labels'),
+    ('openshift_hosted_metrics_deployer_prefix', 'openshift_metrics_image_prefix'),
+    ('openshift_hosted_metrics_deployer_version', 'openshift_metrics_image_version'),
+    ('openshift_hosted_metrics_deploy', 'openshift_metrics_install_metrics'),
+    ('openshift_hosted_metrics_storage_kind', 'openshift_metrics_storage_kind'),
+    ('openshift_hosted_metrics_public_url', 'openshift_metrics_hawkular_hostname'),
 )
 
 # JSON_FORMAT_VARIABLES does not intende to cover all json variables, but

roles/openshift_health_checker/openshift_checks/logging/fluentd_config.py

@@ -12,7 +12,7 @@ class FluentdConfig(LoggingCheck):
     tags = ["health"]
 
     def is_active(self):
-        logging_deployed = self.get_var("openshift_hosted_logging_deploy", default=False)
+        logging_deployed = self.get_var("openshift_logging_install_logging", default=False)
 
         try:
             version = self.get_major_minor_version(self.get_var("openshift_image_tag"))

roles/openshift_health_checker/openshift_checks/logging/logging.py

@@ -27,7 +27,7 @@ class LoggingCheck(OpenShiftCheck):
     name = "logging"
 
     def is_active(self):
-        logging_deployed = self.get_var("openshift_hosted_logging_deploy", convert=bool, default=False)
+        logging_deployed = self.get_var("openshift_logging_install_logging", convert=bool, default=False)
         return logging_deployed and super(LoggingCheck, self).is_active() and self.is_first_master()
 
     def run(self):

roles/openshift_health_checker/test/logging_check_test.py

@@ -112,7 +112,7 @@ def test_is_active(groups, logging_deployed, is_active):
     task_vars = dict(
         ansible_host='this-host',
         groups=groups,
-        openshift_hosted_logging_deploy=logging_deployed,
+        openshift_logging_install_logging=logging_deployed,
     )
 
     assert LoggingCheck(None, task_vars).is_active() == is_active

roles/openshift_logging/tasks/install_logging.yaml

@@ -243,7 +243,6 @@
     openshift_logging_kibana_replicas: "{{ openshift_logging_kibana_replica_count }}"
     openshift_logging_kibana_es_host: "{{ openshift_logging_es_host }}"
     openshift_logging_kibana_es_port: "{{ openshift_logging_es_port }}"
-    openshift_logging_kibana_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
 
 
 - import_role:
@@ -254,7 +253,6 @@
     openshift_logging_kibana_namespace: "{{ openshift_logging_namespace }}"
     openshift_logging_kibana_master_url: "{{ openshift_logging_master_url }}"
     openshift_logging_kibana_master_public_url: "{{ openshift_logging_master_public_url }}"
-    openshift_logging_kibana_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
     openshift_logging_kibana_es_host: "{{ openshift_logging_es_ops_host }}"
     openshift_logging_kibana_es_port: "{{ openshift_logging_es_ops_port }}"
     openshift_logging_kibana_nodeselector: "{{ openshift_logging_kibana_ops_nodeselector }}"

roles/openshift_logging_curator/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 ### General logging settings
-openshift_logging_curator_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
+openshift_logging_curator_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
 openshift_logging_curator_master_url: "https://kubernetes.default.svc.cluster.local"
 
 openshift_logging_curator_namespace: openshift-logging

roles/openshift_logging_curator/tasks/main.yaml

@@ -32,8 +32,8 @@
     state: present
     name: "aggregated-logging-curator"
     namespace: "{{ openshift_logging_namespace }}"
-    image_pull_secrets: "{{ openshift_logging_image_pull_secret }}"
-  when: openshift_logging_image_pull_secret != ''
+    image_pull_secrets: "{{ openshift_logging_curator_image_pull_secret }}"
+  when: openshift_logging_curator_image_pull_secret != ''
 
 - name: Create Curator service account
   oc_serviceaccount:
@@ -41,7 +41,7 @@
     name: "aggregated-logging-curator"
     namespace: "{{ openshift_logging_namespace }}"
   when:
-    - openshift_logging_image_pull_secret == ''
+    - openshift_logging_curator_image_pull_secret == ''
 
 # secret
 - name: Set Curator secret

roles/openshift_logging_elasticsearch/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 ### Common settings
-openshift_logging_elasticsearch_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
+openshift_logging_elasticsearch_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
 openshift_logging_elasticsearch_namespace: openshift-logging
 
 openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_nodeselector | default('') }}"
@@ -35,7 +35,7 @@ openshift_logging_elasticsearch_pvc_storage_class_name: ""
 openshift_logging_elasticsearch_pvc_access_modes: ['ReadWriteOnce']
 openshift_logging_elasticsearch_storage_group: ['65534']
 
-openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_prefix | default('logging-es') }}"
+openshift_logging_es_pvc_prefix: "logging-es"
 
 # config the es plugin to write kibana index based on the index mode
 openshift_logging_elasticsearch_kibana_index_mode: 'unique'
@@ -55,7 +55,7 @@ openshift_logging_es_config: {}
 
 
 openshift_logging_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}"
-openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' ~ openshift_master_api_port) }}"
+openshift_logging_master_public_url: "{{ 'https://' + openshift.common.public_hostname + ':' ~ openshift_master_api_port }}"
 openshift_logging_es_host: logging-es
 openshift_logging_es_port: 9200
 openshift_logging_es_ca: /etc/fluent/keys/ca

roles/openshift_logging_elasticsearch/tasks/main.yaml

@@ -65,8 +65,8 @@
     state: present
     name: "aggregated-logging-elasticsearch"
     namespace: "{{ openshift_logging_elasticsearch_namespace }}"
-    image_pull_secrets: "{{ openshift_logging_image_pull_secret }}"
-  when: openshift_logging_image_pull_secret != ''
+    image_pull_secrets: "{{ openshift_logging_elasticsearch_image_pull_secret }}"
+  when: openshift_logging_elasticsearch_image_pull_secret != ''
 
 - name: Create ES service account
   oc_serviceaccount:
@@ -74,7 +74,7 @@
     name: "aggregated-logging-elasticsearch"
     namespace: "{{ openshift_logging_elasticsearch_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+  - openshift_logging_elasticsearch_image_pull_secret == ''
 
 # rolebinding reader
 - name: Create rolebinding-reader role

roles/openshift_logging_fluentd/defaults/main.yml

@@ -1,12 +1,13 @@
 ---
 ### General logging settings
-openshift_logging_fluentd_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
+openshift_logging_fluentd_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
 openshift_logging_fluentd_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}"
 openshift_logging_fluentd_namespace: openshift-logging
 
 ### Common settings
 # map_from_pairs is a custom filter plugin in role lib_utils
-openshift_logging_fluentd_nodeselector: "{{ openshift_hosted_logging_fluentd_nodeselector_label | default('logging-infra-fluentd=true') | map_from_pairs }}"
+openshift_logging_fluentd_nodeselector:
+  logging-infra-fluentd: 'true'
 openshift_logging_fluentd_cpu_limit: null
 openshift_logging_fluentd_cpu_request: 100m
 openshift_logging_fluentd_memory_limit: 756Mi
@@ -28,8 +29,8 @@ openshift_logging_fluentd_ops_host: "{{ openshift_logging_fluentd_app_host }}"
 openshift_logging_fluentd_ops_port: "{{ openshift_logging_fluentd_app_port }}"
 
 ### Used by "hosted" and "secure-aggregator" deployments
-openshift_logging_fluentd_journal_source: "{{ openshift_hosted_logging_journal_source | default('') }}"
-openshift_logging_fluentd_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}"
+openshift_logging_fluentd_journal_source: ""
+openshift_logging_fluentd_journal_read_from_head: ""
 
 openshift_logging_fluentd_app_client_cert: /etc/fluent/keys/cert
 openshift_logging_fluentd_app_client_key: /etc/fluent/keys/key

roles/openshift_logging_fluentd/tasks/main.yaml

@@ -58,8 +58,8 @@
     state: present
     name: "aggregated-logging-fluentd"
     namespace: "{{ openshift_logging_fluentd_namespace }}"
-    image_pull_secrets: "{{ openshift_logging_image_pull_secret }}"
-  when: openshift_logging_image_pull_secret != ''
+    image_pull_secrets: "{{ openshift_logging_fluentd_image_pull_secret }}"
+  when: openshift_logging_fluentd_image_pull_secret != ''
 
 - name: Create Fluentd service account
   oc_serviceaccount:
@@ -67,7 +67,7 @@
     name: "aggregated-logging-fluentd"
     namespace: "{{ openshift_logging_fluentd_namespace }}"
   when:
-    - openshift_logging_image_pull_secret == ''
+    - openshift_logging_fluentd_image_pull_secret == ''
 
 # set service account scc
 - name: Set privileged permissions for Fluentd

roles/openshift_logging_kibana/defaults/main.yml

@@ -2,7 +2,7 @@
 ### Common settings
 openshift_logging_kibana_master_url: "https://kubernetes.default.svc.cluster.local"
 openshift_logging_kibana_master_public_url: "https://kubernetes.default.svc.cluster.local"
-openshift_logging_kibana_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
+openshift_logging_kibana_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
 openshift_logging_kibana_namespace: openshift-logging
 
 openshift_logging_kibana_nodeselector: ""
@@ -10,7 +10,7 @@ openshift_logging_kibana_cpu_limit: null
 openshift_logging_kibana_cpu_request: 100m
 openshift_logging_kibana_memory_limit: 736Mi
 
-openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ openshift_master_default_subdomain) }}"
+openshift_logging_kibana_hostname: "{{ 'kibana.' ~ openshift_master_default_subdomain }}"
 
 openshift_logging_kibana_es_host: "logging-es"
 openshift_logging_kibana_es_port: 9200

roles/openshift_logging_kibana/tasks/main.yaml

@@ -34,8 +34,8 @@
     state: present
     name: "aggregated-logging-kibana"
     namespace: "{{ openshift_logging_namespace }}"
-    image_pull_secrets: "{{ openshift_logging_image_pull_secret }}"
-  when: openshift_logging_image_pull_secret != ''
+    image_pull_secrets: "{{ openshift_logging_kibana_image_pull_secret }}"
+  when: openshift_logging_kibana_image_pull_secret != ''
 
 - name: Create Kibana service account
   oc_serviceaccount:
@@ -43,7 +43,7 @@
     name: "aggregated-logging-kibana"
     namespace: "{{ openshift_logging_namespace }}"
   when:
-    - openshift_logging_image_pull_secret == ''
+    - openshift_logging_kibana_image_pull_secret == ''
 
 - set_fact:
     kibana_name: "{{ 'logging-kibana' ~ ( (openshift_logging_kibana_ops_deployment | default(false) | bool) | ternary('-ops', '')) }}"

roles/openshift_logging_mux/defaults/main.yml

@@ -1,8 +1,8 @@
 ---
 ### General logging settings
-openshift_logging_mux_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
+openshift_logging_mux_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"
 openshift_logging_mux_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}"
-openshift_logging_mux_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' ~ openshift_master_api_port) }}"
+openshift_logging_mux_master_public_url: "{{ 'https://' + openshift.common.public_hostname + ':' ~ openshift_master_api_port }}"
 openshift_logging_mux_namespace: openshift-logging
 
 ### Common settings
@@ -24,8 +24,8 @@ openshift_logging_mux_ops_host: "{{ openshift_logging_mux_app_host }}"
 openshift_logging_mux_ops_port: "{{ openshift_logging_mux_app_port }}"
 
 ### Used by "hosted" and "secure-aggregator" deployments
-openshift_logging_mux_journal_source: "{{ openshift_hosted_logging_journal_source | default('') }}"
-openshift_logging_mux_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}"
+openshift_logging_mux_journal_source: ""
+openshift_logging_mux_journal_read_from_head: ""
 
 openshift_logging_mux_allow_external: False
 openshift_logging_use_mux: "{{ openshift_logging_mux_allow_external | default(False) }}"

roles/openshift_logging_mux/tasks/main.yaml

@@ -43,8 +43,8 @@
     state: present
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
-    image_pull_secrets: "{{ openshift_logging_image_pull_secret }}"
-  when: openshift_logging_image_pull_secret != ''
+    image_pull_secrets: "{{ openshift_logging_mux_image_pull_secret }}"
+  when: openshift_logging_mux_image_pull_secret != ''
 
 - name: Create Mux service account
   oc_serviceaccount:
@@ -52,7 +52,7 @@
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
   when:
-  - openshift_logging_image_pull_secret == ''
+  - openshift_logging_mux_image_pull_secret == ''
 
 # set service account scc
 - name: Set privileged permissions for Mux

roles/openshift_master_facts/tasks/main.yml

@@ -2,24 +2,24 @@
 - name: Verify required variables are set
   fail:
     msg: openshift_master_default_subdomain must be set to deploy metrics
-  when: openshift_hosted_metrics_deploy | default(false) | bool and openshift_master_default_subdomain == ""
+  when: openshift_metrics_install_metrics | default(false) | bool and openshift_master_default_subdomain == ""
 
 # NOTE: These metrics variables are unfortunately needed by both the master and the metrics roles
 # to properly configure the master-config.yaml file.
 #
 # NOTE: Today only changing the hostname for the metrics public URL is supported, the
-# path must stay consistent. As such if openshift_hosted_metrics_public_url is set in
-# inventory, we extract the hostname, and then reset openshift_hosted_metrics_public_url
+# path must stay consistent. As such if openshift_metrics_hawkular_hostname is set in
+# inventory, we extract the hostname, and then reset openshift_metrics_hawkular_hostname
 # to the format that we know is valid. (This may change in future)
 - name: Set g_metrics_hostname
   set_fact:
-    g_metrics_hostname: "{{ openshift_hosted_metrics_public_url
+    g_metrics_hostname: "{{ openshift_metrics_hawkular_hostname
                         | default('hawkular-metrics.' ~ openshift_master_default_subdomain)
                         | lib_utils_oo_hostname_from_url }}"
 
 - set_fact:
     openshift_hosted_metrics_deploy_url: "https://{{ g_metrics_hostname }}/hawkular/metrics"
-  when: (openshift_hosted_metrics_deploy | default(false) | bool) or (openshift_hosted_metrics_public_url is defined)
+  when: (openshift_metrics_install_metrics | default(false) | bool) or (openshift_metrics_hawkular_hostname is defined)
 
 - name: Set master facts
   openshift_facts:

roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml

@@ -2,42 +2,10 @@
 # this is used to set the logging variables from deprecated values to the current variables names
 # this file should be deleted once variables are no longer honored
 
-- conditional_set_fact:
-    facts: "{{ hostvars[inventory_hostname] }}"
-    vars:
-      logging_hostname: openshift_hosted_logging_hostname
-      logging_ops_hostname: openshift_hosted_logging_ops_hostname
-      logging_elasticsearch_cluster_size: openshift_hosted_logging_elasticsearch_cluster_size
-      logging_elasticsearch_ops_cluster_size: openshift_hosted_logging_elasticsearch_ops_cluster_size
-      openshift_logging_storage_kind: openshift_hosted_logging_storage_kind
-      openshift_logging_storage_host: openshift_hosted_logging_storage_host
-      openshift_logging_storage_labels: openshift_hosted_logging_storage_labels
-      openshift_logging_storage_volume_size: openshift_hosted_logging_storage_volume_size
-      openshift_loggingops_storage_kind: openshift_hosted_loggingops_storage_kind
-      openshift_loggingops_storage_host: openshift_hosted_loggingops_storage_host
-      openshift_loggingops_storage_labels: openshift_hosted_loggingops_storage_labels
-      openshift_loggingops_storage_volume_size: openshift_hosted_loggingops_storage_volume_size
-      openshift_logging_use_ops: openshift_hosted_logging_enable_ops_cluster
-      openshift_logging_image_pull_secret: openshift_hosted_logging_image_pull_secret
-      openshift_logging_kibana_hostname: openshift_hosted_logging_hostname
-      openshift_logging_kibana_ops_hostname: openshift_hosted_logging_ops_hostname
-      openshift_logging_kibana_nodeselector: openshift_hosted_logging_kibana_nodeselector
-      openshift_logging_kibana_ops_nodeselector: openshift_hosted_logging_kibana_ops_nodeselector
-      openshift_logging_fluentd_journal_source: openshift_hosted_logging_journal_source
-      openshift_logging_fluentd_journal_read_from_head: openshift_hosted_logging_journal_read_from_head
-      openshift_logging_fluentd_nodeselector: openshift_hosted_logging_fluentd_nodeselector_label
-      openshift_logging_es_memory_limit: openshift_hosted_logging_elasticsearch_instance_ram
-      openshift_logging_es_nodeselector: openshift_hosted_logging_elasticsearch_nodeselector
-      openshift_logging_es_ops_nodeselector: openshift_hosted_logging_elasticsearch_ops_nodeselector
-      openshift_logging_es_ops_memory_limit: openshift_hosted_logging_elasticsearch_ops_instance_ram
-      openshift_logging_storage_access_modes: openshift_hosted_logging_storage_access_modes
-      openshift_logging_master_public_url: openshift_hosted_logging_master_public_url
-      openshift_logging_image_prefix: openshift_hosted_logging_deployer_prefix
-      openshift_logging_image_version: openshift_hosted_logging_deployer_version
-      openshift_logging_install_logging: openshift_hosted_logging_deploy
-      openshift_logging_curator_nodeselector: openshift_hosted_logging_curator_nodeselector
-      openshift_logging_curator_ops_nodeselector: openshift_hosted_logging_curator_ops_nodeselector
-
+# - conditional_set_fact:
+#     facts: "{{ hostvars[inventory_hostname] }}"
+#     vars:
+#       new: old
 
 - set_fact:
     openshift_logging_elasticsearch_pvc_dynamic: "{{ 'true' if openshift_logging_storage_kind | default(none) == 'dynamic' else omit if openshift_logging_storage_kind | default(none) == 'nfs' else '' }}"

roles/openshift_sanitize_inventory/tasks/__deprecations_metrics.yml

@@ -1,18 +0,0 @@
----
-# this is used to set the metrics variables from deprecated values to the current variables names
-# this file should be deleted once variables are no longer honored
-
-- conditional_set_fact:
-    facts: "{{ hostvars[inventory_hostname] }}"
-    vars:
-      openshift_metrics_storage_access_modes: openshift_hosted_metrics_storage_access_modes
-      openshift_metrics_storage_host: openshift_hosted_metrics_storage_host
-      openshift_metrics_storage_nfs_directory: openshift_hosted_metrics_storage_nfs_directory
-      openshift_metrics_storage_volume_name: openshift_hosted_metrics_storage_volume_name
-      openshift_metrics_storage_volume_size: openshift_hosted_metrics_storage_volume_size
-      openshift_metrics_storage_labels: openshift_hosted_metrics_storage_labels
-      openshift_metrics_image_prefix: openshift_hosted_metrics_deployer_prefix
-      openshift_metrics_image_version: openshift_hosted_metrics_deployer_version
-      openshift_metrics_install_metrics: openshift_hosted_metrics_deploy
-      openshift_metrics_storage_kind: openshift_hosted_metrics_storage_kind
-      openshift_metrics_hawkular_hostname: openshift_hosted_metrics_public_url

roles/openshift_sanitize_inventory/tasks/deprecations.yml

@@ -18,8 +18,5 @@
   when:
   - dep_check.changed
 
-# for with_fileglob Ansible resolves the path relative to the roles/<rolename>/files directory
 - name: Assign deprecated variables to correct counterparts
-  include_tasks: "{{ item }}"
-  with_fileglob:
-  - "../tasks/__deprecations_*.yml"
+  import_tasks: __deprecations_logging.yml

roles/openshift_sanitize_inventory/vars/main.yml

@@ -5,76 +5,7 @@ __deprecation_header: "[DEPRECATION WARNING]: The following are deprecated varia
 # this is a list of variables that we will be deprecating within the next minor release, this list should be expected to change from release to release
 __warn_deprecated_vars:
   # logging
-  - 'openshift_hosted_logging_deploy'
-  - 'openshift_hosted_logging_hostname'
-  - 'openshift_hosted_logging_ops_hostname'
-  - 'openshift_hosted_logging_master_public_url'
-  - 'openshift_hosted_logging_elasticsearch_cluster_size'
-  - 'openshift_hosted_logging_elasticsearch_ops_cluster_size'
-  - 'openshift_hosted_logging_image_pull_secret'
-  - 'openshift_hosted_logging_enable_ops_cluster'
-  - 'openshift_hosted_logging_curator_nodeselector'
-  - 'openshift_hosted_logging_curator_ops_nodeselector'
-  - 'openshift_hosted_logging_kibana_nodeselector'
-  - 'openshift_hosted_logging_kibana_ops_nodeselector'
-  - 'openshift_hosted_logging_fluentd_nodeselector_label'
-  - 'openshift_hosted_logging_journal_source'
-  - 'openshift_hosted_logging_journal_read_from_head'
-  - 'openshift_hosted_logging_elasticsearch_instance_ram'
-  - 'openshift_hosted_logging_storage_labels'
-  - 'openshift_hosted_logging_elasticsearch_pvc_dynamic'
-  - 'openshift_hosted_logging_elasticsearch_pvc_size'
-  - 'openshift_hosted_logging_elasticsearch_pvc_prefix'
-  - 'openshift_hosted_logging_elasticsearch_storage_group'
-  - 'openshift_hosted_logging_elasticsearch_nodeselector'
-  - 'openshift_hosted_logging_elasticsearch_ops_instance_ram'
-  - 'openshift_hosted_loggingops_storage_labels'
-  - 'openshift_hosted_logging_elasticsearch_ops_pvc_dynamic'
-  - 'openshift_hosted_logging_elasticsearch_ops_pvc_size'
-  - 'openshift_hosted_logging_elasticsearch_ops_pvc_prefix'
-  - 'openshift_hosted_logging_elasticsearch_storage_group'
-  - 'openshift_hosted_logging_elasticsearch_ops_nodeselector'
-  - 'openshift_hosted_logging_storage_access_modes'
-  - 'openshift_hosted_logging_storage_kind'
-  - 'openshift_hosted_loggingops_storage_kind'
-  - 'openshift_hosted_logging_storage_host'
-  - 'openshift_hosted_loggingops_storage_host'
-  - 'openshift_hosted_logging_storage_nfs_directory'
-  - 'openshift_hosted_loggingops_storage_nfs_directory'
-  - 'openshift_hosted_logging_storage_volume_name'
-  - 'openshift_hosted_loggingops_storage_volume_name'
-  - 'openshift_hosted_logging_storage_volume_size'
-  - 'openshift_hosted_loggingops_storage_volume_size'
-  - 'openshift_hosted_logging_enable_ops_cluster'
-  - 'openshift_hosted_logging_image_pull_secret'
-  - 'openshift_hosted_logging_curator_nodeselector'
-  - 'openshift_hosted_logging_curator_ops_nodeselector'
-  - 'openshift_hosted_logging_kibana_nodeselector'
-  - 'openshift_hosted_logging_kibana_ops_nodeselector'
-  - 'openshift_hosted_logging_ops_hostname'
-  - 'openshift_hosted_logging_fluentd_nodeselector_label'
-  - 'openshift_hosted_logging_journal_source'
-  - 'openshift_hosted_logging_journal_read_from_head'
-  - 'openshift_hosted_logging_elasticsearch_instance_ram'
-  - 'openshift_hosted_logging_elasticsearch_nodeselector'
-  - 'openshift_hosted_logging_elasticsearch_ops_instance_ram'
-  - 'openshift_hosted_logging_elasticsearch_ops_nodeselector'
-  - 'openshift_hosted_logging_storage_access_modes'
-  - 'openshift_hosted_logging_deployer_prefix'
-  - 'openshift_hosted_logging_deployer_version'
   - 'openshift_logging_namespace'
-  # metrics
-  - 'openshift_hosted_metrics_deploy'
-  - 'openshift_hosted_metrics_storage_kind'
-  - 'openshift_hosted_metrics_storage_access_modes'
-  - 'openshift_hosted_metrics_storage_host'
-  - 'openshift_hosted_metrics_storage_nfs_directory'
-  - 'openshift_hosted_metrics_storage_volume_name'
-  - 'openshift_hosted_metrics_storage_volume_size'
-  - 'openshift_hosted_metrics_storage_labels'
-  - 'openshift_hosted_metrics_deployer_prefix'
-  - 'openshift_hosted_metrics_deployer_version'
-  - 'openshift_hosted_metrics_public_url'
   # labels and kubelet args
   - 'openshift_node_labels'
   - 'openshift_node_kubelet_args'