From 2c0ab8089c22450d93f10d7dbbb03def3c450696 Mon Sep 17 00:00:00 2001 From: Alex Dellapenta Date: Fri, 3 Feb 2017 18:10:07 -0500 Subject: [PATCH] Update logging and metrics deployer paths --- install_config/aggregate_logging.adoc | 2 +- install_config/cluster_metrics.adoc | 20 +++++++++---------- .../deploy_registry_existing_clusters.adoc | 2 +- install_config/upgrading/manual_upgrades.adoc | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/install_config/aggregate_logging.adoc b/install_config/aggregate_logging.adoc index 57e3e39185a9..70d573acfd21 100644 --- a/install_config/aggregate_logging.adoc +++ b/install_config/aggregate_logging.adoc @@ -58,7 +58,7 @@ Otherwise you can create it with the following command: ==== ---- $ oc apply -n openshift -f \ - /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml + /usr/share/ansible/openshift-ansible/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml ---- ==== endif::openshift-enterprise[] diff --git a/install_config/cluster_metrics.adoc b/install_config/cluster_metrics.adoc index 2b03df1853e8..356dd6def381 100644 --- a/install_config/cluster_metrics.adoc +++ b/install_config/cluster_metrics.adoc @@ -173,9 +173,9 @@ pods. It is the administrator's responsibility to ensure that the size requirements are sufficient for their setup and to monitor usage to ensure that the disk does not become full. -If you would like to use xref:../install_config/persistent_storage/dynamically_provisioning_pvs.adoc#install-config-persistent-storage-dynamically-provisioning-pvs[dynamically provisioned persistent volumes] +If you would like to use xref:../install_config/persistent_storage/dynamically_provisioning_pvs.adoc#install-config-persistent-storage-dynamically-provisioning-pvs[dynamically provisioned persistent volumes] you must set the `*DYNAMICALLY_PROVISION_STORAGE*` -xref:../install_config/cluster_metrics.adoc#modifying-the-deployer-template[template option] +xref:../install_config/cluster_metrics.adoc#modifying-the-deployer-template[template option] to `true` for the Metrics Deployer. [[capacity-planning-for-openshift-metrics]] @@ -198,7 +198,7 @@ deployed with settings of `*MAX_HEAP_SIZE=512M*` and `*NEW_HEAP_SIZE=100M*`. These values should cover most {product-title} metrics installations, but you can modify them in the ifdef::openshift-origin[] -link:https://github.com/openshift/origin-metrics/blob/master/cassandra/Dockerfile[Cassandra Dockerfile] +link:https://github.com/openshift/origin-metrics/blob/master/cassandra/Dockerfile[Cassandra Dockerfile] endif::openshift-origin[] ifdef::openshift-enterprise[] Cassandra Dockerfile @@ -207,7 +207,7 @@ prior to deploying cluster metrics. By default, metrics data is stored for 7 days. You can configure this with the `*METRIC_DURATION*` parameter in the ifdef::openshift-origin[] -link:https://github.com/openshift/origin-metrics/blob/master/metrics.yaml[*_metrics.yaml_* configuration file]. +link:https://github.com/openshift/origin-metrics/blob/master/metrics.yaml[*_metrics.yaml_* configuration file]. endif::openshift-origin[] ifdef::openshift-enterprise[] *_metrics.yaml_* configuration file. @@ -454,11 +454,9 @@ https://github.com/openshift/openshift-ansible/blob/master/roles/openshift_examp endif::[] ifdef::openshift-enterprise[] -==== ---- -/usr/share/openshift/examples/infrastructure-templates/enterprise/metrics-deployer.yaml +/usr/share/ansible/openshift-ansible/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml ---- -==== endif::[] In case you need to make any changes to this file, copy it to another directory @@ -714,7 +712,7 @@ will be able to write metrics to the system, which can affect performance and cause Cassandra disk usage to unpredictably increase. ==== -The link:http://www.hawkular.org/docs/rest/rest-metrics.html[Hawkular Metrics documentation] +The link:http://www.hawkular.org/docs/rest/rest-metrics.html[Hawkular Metrics documentation] covers how to use the API, but there are a few differences when dealing with the version of Hawkular Metrics configured for use on {product-title}: @@ -784,8 +782,8 @@ nodes. Scaling {product-title} metrics heapster pods is not recommended. [[cluster-metrics-scaling-pods-prereqs]] === Prerequisites -If persistent storage was used to deploy {product-title} metrics, then you must -xref:../dev_guide/persistent_volumes.adoc#dev-guide-persistent-volumes[create a persistent volume (PV)] +If persistent storage was used to deploy {product-title} metrics, then you must +xref:../dev_guide/persistent_volumes.adoc#dev-guide-persistent-volumes[create a persistent volume (PV)] for the new Cassandra pod to use before you can scale out the number of {product-title} metrics Cassandra pods. However, if Cassandra was deployed with dynamically provisioned PVs, then this step is not necessary. @@ -795,7 +793,7 @@ dynamically provisioned PVs, then this step is not necessary. The Cassandra nodes use persistent storage, therefore scaling up or down is not possible with replication controllers. -Scaling a Cassandra cluster requires you to use the `hawkular-cassandra-node` template. By default, the Cassandra cluster is a single-node cluster. +Scaling a Cassandra cluster requires you to use the `hawkular-cassandra-node` template. By default, the Cassandra cluster is a single-node cluster. ifdef::openshift-origin[] To add a second node with 10Gi of storage: diff --git a/install_config/registry/deploy_registry_existing_clusters.adoc b/install_config/registry/deploy_registry_existing_clusters.adoc index 01c28685aa36..8bc0083555b2 100644 --- a/install_config/registry/deploy_registry_existing_clusters.adoc +++ b/install_config/registry/deploy_registry_existing_clusters.adoc @@ -314,7 +314,7 @@ ifdef::openshift-origin[] . Install template in the default namespace + ---- -oc create -n default -f https://raw.githubusercontent.com/openshift/openshift-ansible/master/roles/openshift_examples/files/examples/v1.3/infrastructure-templates/origin/registry-console.yaml +oc create -n default -f https://raw.githubusercontent.com/openshift/openshift-ansible/master/roles/openshift_hosted_templates/files/v1.4/origin/registry-console.yaml ---- + endif::[] diff --git a/install_config/upgrading/manual_upgrades.adoc b/install_config/upgrading/manual_upgrades.adoc index 0f3ec4a3ba83..7a1e588f9cb2 100644 --- a/install_config/upgrading/manual_upgrades.adoc +++ b/install_config/upgrading/manual_upgrades.adoc @@ -1298,7 +1298,7 @@ $ oc project logging ifdef::openshift-enterprise[] ---- $ oc apply -n openshift -f \ - /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml + /usr/share/ansible/openshift-ansible/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml ---- endif::[] ifdef::openshift-origin[]