diff options
| -rw-r--r-- | README_AWS.md | 4 | ||||
| -rw-r--r-- | README_CONTAINERIZED_INSTALLATION.md | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/README_AWS.md b/README_AWS.md index cccb122f6..650a921a4 100644 --- a/README_AWS.md +++ b/README_AWS.md @@ -1,4 +1,4 @@ -:warning: **WARNING** :warning: This feature is community supported and has not been tested by Red Hat. Visit [docs.openshift.com](https://docs.openshift.com) for [OpenShift Enterprise](https://docs.openshift.com/enterprise/latest/install_config/install/index.html) or [OpenShift Origin](https://docs.openshift.org/latest/install_config/install/index.html) supported installation docs. +:warning: **WARNING** :warning: This feature is community supported and has not been tested by Red Hat. Visit [docs.openshift.com](https://docs.openshift.com) for [OpenShift Enterprise](https://docs.openshift.com/enterprise/latest/install_config/install/planning.html) or [OpenShift Origin](https://docs.openshift.org/latest/install_config/install/planning.html) supported installation docs. AWS Setup Instructions ====================== @@ -196,5 +196,5 @@ You should now be ready to follow the **What's Next?** section of the advanced i Refer to the advanced installation guide for your deployment type: -* [OpenShift Enterprise](https://docs.openshift.com/enterprise/3.0/install_config/install/advanced_install.html#what-s-next) +* [OpenShift Enterprise](https://docs.openshift.com/enterprise/latest/install_config/install/advanced_install.html#what-s-next) * [OpenShift Origin](https://docs.openshift.org/latest/install_config/install/advanced_install.html#what-s-next) diff --git a/README_CONTAINERIZED_INSTALLATION.md b/README_CONTAINERIZED_INSTALLATION.md index 56f25546c..c615154ef 100644 --- a/README_CONTAINERIZED_INSTALLATION.md +++ b/README_CONTAINERIZED_INSTALLATION.md @@ -1,8 +1,8 @@ # Overview Users may now deploy containerized versions of OpenShift Origin, OpenShift -Enterprise, or Atomic Enterprise Platform on Atomic -Host[https://projectatomic.io] or RHEL, Centos, and Fedora. This includes +Enterprise, or Atomic Enterprise Platform on [Atomic +Host](https://projectatomic.io) or RHEL, Centos, and Fedora. This includes OpenvSwitch based SDN. diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 3975e2686..e688556b3 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -49,9 +49,9 @@ when: not openshift.common.version_gte_3_2_or_1_2 - role: openshift_hosted - role: openshift_metrics - when: openshift.hosted.metrics.deploy | bool + when: openshift_hosted_metrics_deploy | default(false) | bool - role: openshift_hosted_logging - when: openshift.hosted.logging.deploy | bool + when: openshift_hosted_logging_deploy | default(false) | bool openshift_hosted_logging_hostname: "{{ logging_hostname }}" openshift_hosted_logging_ops_hostname: "{{ logging_ops_hostname }}" openshift_hosted_logging_master_public_url: "{{ logging_master_public_url }}" diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index 092b0fb35..cfe7ac81c 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -4,6 +4,8 @@ log: http: addr: :5000 storage: + delete: + enabled: true cache: blobdescriptor: inmemory {% if openshift.hosted.registry.storage.provider == 's3' %} |