Jelajahi Sumber

Merge pull request #7348 from spadgett/fail-console-port

Automatic merge from submit-queue.

Bug 1550148 - Fail install if console port does not match API server port

https://bugzilla.redhat.com/show_bug.cgi?id=1550148

/assign @sdodson 
cc @jwforres
OpenShift Merge Robot 7 tahun lalu
induk
melakukan
8ce73ffb40
1 mengubah file dengan 23 tambahan dan 0 penghapusan
  1. 23 0
      roles/openshift_sanitize_inventory/tasks/main.yml

+ 23 - 0
roles/openshift_sanitize_inventory/tasks/main.yml

@@ -76,3 +76,26 @@
     - ( openshift_cloudprovider_vsphere_username is undefined or openshift_cloudprovider_vsphere_password is undefined or
         openshift_cloudprovider_vsphere_host is undefined or openshift_cloudprovider_vsphere_datacenter is undefined or
         openshift_cloudprovider_vsphere_datastore is undefined )
+
+- name: Ensure removed web console extension variables are not set
+  fail:
+    msg: >
+      The OpenShift web console extensions must now be served as URLs. You can
+      add extensions using the openshift_web_console_extension_script_urls
+      and openshift_web_console_extension_stylesheet_urls variables. The
+      following variables are no longer used: openshift_master_extension_scripts,
+      openshift_master_extension_stylesheets, openshift_master_extensions
+  when:
+    - openshift_master_extension_scripts is defined or openshift_master_extension_stylesheets is defined or openshift_master_extensions is defined
+    - openshift_version | version_compare('3.9', '>=')
+
+- name: Ensure that web console port matches API server port
+  fail:
+    msg: >
+      The OpenShift web console port must now match the API server port. If you
+      were previoiusly running the web console on a different port than the API
+      server, please open a support ticket.
+  when:
+    - openshift_master_console_port is defined
+    - openshift_master_console_port != (openshift_master_api_port | default(8443))
+    - openshift_version | version_compare('3.9', '>=')