Remove openshift_web_console_image_name and related

This commit removes openshift_web_console_image_name and
related variables.  This commit adds check for removed
variables in sanity_checks.

roles/lib_utils/action_plugins/sanity_checks.py

@@ -78,7 +78,9 @@ REMOVED_VARIABLES = (
     ('openshift_descheduler_image_prefix', 'openshift_descheduler_image'),
     ('openshift_descheduler_image_version', 'openshift_descheduler_image'),
     ('openshift_docker_gc_version', 'openshift_docker_gc_image'),
-    ('openshift_prometheus_node_exporter_image_version', 'openshift_prometheus_node_exporter_image'),
+    ('openshift_web_console_prefix', 'openshift_web_console_image'),
+    ('openshift_web_console_version', 'openshift_web_console_image'),
+    ('openshift_web_console_image_name', 'openshift_web_console_image'),
 )
 
 

roles/openshift_web_console/defaults/main.yml

@@ -4,7 +4,7 @@ openshift_web_console_nodeselector: {"node-role.kubernetes.io/master":"true"}
 __console_template_file: "console-template.yaml"
 __console_config_file: "console-config.yaml"
 
-openshift_web_console_image_name: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'web-console') }}"
+openshift_web_console_image: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'web-console') }}"
 
 # Default the replica count to the number of masters.
 openshift_web_console_replica_count: "{{ groups.oo_masters_to_config | length }}"

roles/openshift_web_console/tasks/install.yml

@@ -118,7 +118,7 @@
   shell: >
     {{ openshift_client_binary }} process -f "{{ mktemp.stdout }}/{{ __console_template_file }}"
     --param API_SERVER_CONFIG="{{ updated_console_config['content'] | b64decode }}"
-    --param IMAGE="{{ openshift_web_console_image_name }}"
+    --param IMAGE="{{ openshift_web_console_image }}"
     --param NODE_SELECTOR={{ openshift_web_console_nodeselector | to_json | quote }}
     --param REPLICA_COUNT="{{ openshift_web_console_replica_count }}"
     --config={{ mktemp.stdout }}/admin.kubeconfig