Merge pull request #9580 from tremble/docs_updates

Minor Docs updates

README.md

@@ -153,7 +153,7 @@ created for you automatically.
 
 ## Complete Production Installation Documentation:
 
-- [OpenShift Enterprise](https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html)
+- [OpenShift Container Platform](https://docs.openshift.com/container-platform/latest/install_config/install/advanced_install.html)
 - [OpenShift Origin](https://docs.okd.io/latest/install/index.html)
 
 ## Containerized OpenShift Ansible

README_CONTAINERIZED_INSTALLATION.md

@@ -48,7 +48,7 @@ before attempting to pull any of the following images.
         docker.io/openshift/node (node + openshift-sdn + openvswitch rpm for client tools)
         docker.io/openshift/openvswitch (centos7 + openvswitch rpm, runs ovsdb ovsctl processes)
         registry.redhat.io/rhel7/etcd
-    OpenShift Enterprise
+    OpenShift Container Platform
         registry.access.redhat.com/openshift3/ose
         registry.access.redhat.com/openshift3/node
         registry.access.redhat.com/openshift3/openvswitch

inventory/hosts.example

@@ -552,7 +552,7 @@ debug_level=2
 #openshift_hosted_registry_storage_gcs_rootdirectory=/registry
 
 # Metrics deployment
-# See: https://docs.openshift.com/enterprise/latest/install_config/cluster_metrics.html
+# See: https://docs.openshift.com/container-platform/latest/install_config/cluster_metrics.html
 #
 # By default metrics are not automatically deployed, set this to enable them
 #openshift_metrics_install_metrics=true
@@ -778,7 +778,7 @@ debug_level=2
 # Configure custom named certificates (SNI certificates)
 #
 # https://docs.okd.io/latest/install_config/certificate_customization.html
-# https://docs.openshift.com/enterprise/latest/install_config/certificate_customization.html
+# https://docs.openshift.com/container-platform/latest/install_config/certificate_customization.html
 #
 # NOTE: openshift_master_named_certificates is cached on masters and is an
 # additive fact, meaning that each run with a different set of certificates

playbooks/adhoc/uninstall_docker.yml

@@ -1,4 +1,4 @@
-# This deletes *ALL* Origin and OpenShift Enterprise content installed by
+# This deletes *ALL* Origin and OpenShift Container Platform content installed by
 # ansible.  This includes:
 #
 #    configuration

playbooks/adhoc/uninstall_openshift.yml

@@ -1,4 +1,4 @@
-# This deletes *ALL* Origin and OpenShift Enterprise content installed by
+# This deletes *ALL* Origin and OpenShift Container Platform content installed by
 # ansible.  This includes:
 #
 #    configuration

playbooks/common/openshift-cluster/upgrades/post_control_plane.yml

@@ -65,7 +65,7 @@
 
   - name: Warn if pluginOrderOverride is in use in master-config.yaml
     debug:
-      msg: "WARNING pluginOrderOverride is being deprecated in master-config.yaml, please see https://docs.openshift.com/enterprise/latest/architecture/additional_concepts/admission_controllers.html for more information."
+      msg: "WARNING pluginOrderOverride is being deprecated in master-config.yaml, please see https://docs.openshift.com/container-platform/latest/architecture/additional_concepts/admission_controllers.html for more information."
     when:
     - not (grep_plugin_order_override is skipped)
     - grep_plugin_order_override.rc == 0

roles/lib_openshift/library/oc_service.py

@@ -119,7 +119,7 @@ options:
   portalip:
     description:
     - The portal ip(virtual ip) address to use with this service.
-    - "https://docs.openshift.com/enterprise/3.0/architecture/core_concepts/pods_and_services.html#services"
+    - "https://docs.openshift.com/container-platform/latest/architecture/core_concepts/pods_and_services.html#services"
     required: false
     default: None
     aliases: []

roles/lib_openshift/src/doc/service

@@ -66,7 +66,7 @@ options:
   portalip:
     description:
     - The portal ip(virtual ip) address to use with this service.
-    - "https://docs.openshift.com/enterprise/3.0/architecture/core_concepts/pods_and_services.html#services"
+    - "https://docs.openshift.com/container-platform/latest/architecture/core_concepts/pods_and_services.html#services"
     required: false
     default: None
     aliases: []

roles/openshift_control_plane/templates/master.env.j2

@@ -4,7 +4,7 @@ AWS_SECRET_ACCESS_KEY={{ openshift_cloudprovider_aws_secret_key }}
 {% endif %}
 
 # Proxy configuration
-# See https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#configuring-global-proxy
+# See https://docs.openshift.com/container-platform/latest/install_config/http_proxies.html#configuring-hosts-for-proxies-using-ansible
 {% if 'http_proxy' in openshift.common %}
 HTTP_PROXY={{ openshift.common.http_proxy | default('') }}
 {% endif %}

roles/openshift_storage_nfs_lvm/defaults/main.yml

@@ -13,5 +13,5 @@ osnl_volume_group: openshiftvg
 # what to do with the volume after it is released.
 #
 # Valid values are "Retain" or "Recycle".
-# See https://docs.openshift.com/enterprise/3.0/architecture/additional_concepts/storage.html#pv-recycling-policy
+# See https://docs.openshift.com/container-platform/latest/architecture/additional_concepts/storage.html#pv-reclaim-policy
 osnl_volume_reclaim_policy: "Recycle"

roles/rhel_subscribe/README.md

@@ -24,6 +24,6 @@ Custom hostname for the Satellite server (optional).
 
 ### `openshift_release`
 
-Version for the OpenShift Enterprise repositories.
+Version for the OpenShift Container Platform repositories.
 
 Example: `3.6`