Move infrastructure templates into openshift_hosted_templates role.

4 files changed, 0 insertions, 535 deletions

diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/logging-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/logging-deployer.yaml
deleted file mode 100644
index 9c8f1071a..000000000
--- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/logging-deployer.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-apiVersion: "v1"
-kind: "Template"
-metadata:
-  name: logging-deployer-template
-  annotations:
-    description: "Template for deploying everything needed for aggregated logging. Requires cluster-admin 'logging-deployer' service account and 'logging-deployer' secret."
-    tags: "infrastructure"
-labels:
-  logging-infra: deployer
-  provider: openshift
-  component: deployer
-objects:
--
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    generateName: logging-deployer-
-  spec:
-    containers:
-    - image: ${IMAGE_PREFIX}logging-deployment:${IMAGE_VERSION}
-      imagePullPolicy: Always
-      name: deployer
-      volumeMounts:
-      - name: secret
-        mountPath: /secret
-        readOnly: true
-      - name: empty
-        mountPath: /etc/deploy
-      env:
-        - name: PROJECT
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: IMAGE_PREFIX
-          value: ${IMAGE_PREFIX}
-        - name: IMAGE_VERSION
-          value: ${IMAGE_VERSION}
-        - name: ENABLE_OPS_CLUSTER
-          value: ${ENABLE_OPS_CLUSTER}
-        - name: KIBANA_HOSTNAME
-          value: ${KIBANA_HOSTNAME}
-        - name: KIBANA_OPS_HOSTNAME
-          value: ${KIBANA_OPS_HOSTNAME}
-        - name: PUBLIC_MASTER_URL
-          value: ${PUBLIC_MASTER_URL}
-        - name: MASTER_URL
-          value: ${MASTER_URL}
-        - name: ES_INSTANCE_RAM
-          value: ${ES_INSTANCE_RAM}
-        - name: ES_CLUSTER_SIZE
-          value: ${ES_CLUSTER_SIZE}
-        - name: ES_NODE_QUORUM
-          value: ${ES_NODE_QUORUM}
-        - name: ES_RECOVER_AFTER_NODES
-          value: ${ES_RECOVER_AFTER_NODES}
-        - name: ES_RECOVER_EXPECTED_NODES
-          value: ${ES_RECOVER_EXPECTED_NODES}
-        - name: ES_RECOVER_AFTER_TIME
-          value: ${ES_RECOVER_AFTER_TIME}
-        - name: ES_OPS_INSTANCE_RAM
-          value: ${ES_OPS_INSTANCE_RAM}
-        - name: ES_OPS_CLUSTER_SIZE
-          value: ${ES_OPS_CLUSTER_SIZE}
-        - name: ES_OPS_NODE_QUORUM
-          value: ${ES_OPS_NODE_QUORUM}
-        - name: ES_OPS_RECOVER_AFTER_NODES
-          value: ${ES_OPS_RECOVER_AFTER_NODES}
-        - name: ES_OPS_RECOVER_EXPECTED_NODES
-          value: ${ES_OPS_RECOVER_EXPECTED_NODES}
-        - name: ES_OPS_RECOVER_AFTER_TIME
-          value: ${ES_OPS_RECOVER_AFTER_TIME}
-    dnsPolicy: ClusterFirst
-    restartPolicy: Never
-    serviceAccount: logging-deployer
-    volumes:
-    - name: empty
-      emptyDir: {}
-    - name: secret
-      secret:
-        secretName: logging-deployer
-parameters:
--
-  description: 'Specify prefix for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set prefix "openshift/origin-"'
-  name: IMAGE_PREFIX
-  value: "registry.access.redhat.com/openshift3/"
--
-  description: 'Specify version for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set version "v1.1"'
-  name: IMAGE_VERSION
-  value: "3.1.1"
--
-  description: "If true, set up to use a second ES cluster for ops logs."
-  name: ENABLE_OPS_CLUSTER
-  value: "false"
--
-  description: "External hostname where clients will reach kibana"
-  name: KIBANA_HOSTNAME
-  required: true
--
-  description: "External hostname at which admins will visit the ops Kibana."
-  name: KIBANA_OPS_HOSTNAME
-  value: kibana-ops.example.com
--
-  description: "External URL for the master, for OAuth purposes"
-  name: PUBLIC_MASTER_URL
-  required: true
--
-  description: "Internal URL for the master, for authentication retrieval"
-  name: MASTER_URL
-  value: "https://kubernetes.default.svc.cluster.local"
--
-  description: "Amount of RAM to reserve per ElasticSearch instance."
-  name: ES_INSTANCE_RAM
-  value: "8G"
--
-  description: "How many instances of ElasticSearch to deploy."
-  name: ES_CLUSTER_SIZE
-  required: true
--
-  description: "Number of nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1."
-  name: ES_NODE_QUORUM
--
-  description: "Number of nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_CLUSTER_SIZE."
-  name: ES_RECOVER_AFTER_NODES
--
-  description: "Number of nodes desired to be present before the cluster will recover from a full restart. By default, ES_CLUSTER_SIZE."
-  name: ES_RECOVER_EXPECTED_NODES
--
-  description: "Timeout for *expected* nodes to be present when cluster is recovering from a full restart."
-  name: ES_RECOVER_AFTER_TIME
-  value: "5m"
--
-  description: "Amount of RAM to reserve per ops ElasticSearch instance."
-  name: ES_OPS_INSTANCE_RAM
-  value: "8G"
--
-  description: "How many ops instances of ElasticSearch to deploy. By default, ES_CLUSTER_SIZE."
-  name: ES_OPS_CLUSTER_SIZE
--
-  description: "Number of ops nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1."
-  name: ES_OPS_NODE_QUORUM
--
-  description: "Number of ops nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_OPS_CLUSTER_SIZE."
-  name: ES_OPS_RECOVER_AFTER_NODES
--
-  description: "Number of ops nodes desired to be present before the cluster will recover from a full restart. By default, ES_OPS_CLUSTER_SIZE."
-  name: ES_OPS_RECOVER_EXPECTED_NODES
--
-  description: "Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart."
-  name: ES_OPS_RECOVER_AFTER_TIME
-  value: "5m"
-
diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml
deleted file mode 100644
index 99f2df4fa..000000000
--- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/enterprise/metrics-deployer.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
-# and other contributors as indicated by the @author tags.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-apiVersion: "v1"
-kind: "Template"
-metadata:
-  name: metrics-deployer-template
-  annotations:
-    description: "Template for deploying the required Metrics integration. Requires cluster-admin 'metrics-deployer' service account and 'metrics-deployer' secret."
-    tags: "infrastructure"
-labels:
-  metrics-infra: deployer
-  provider: openshift
-  component: deployer
-objects:
--
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    generateName: metrics-deployer-
-  spec:
-    containers:
-    - image: ${IMAGE_PREFIX}metrics-deployer:${IMAGE_VERSION}
-      name: deployer
-      volumeMounts:
-      - name: secret
-        mountPath: /secret
-        readOnly: true
-      - name: empty
-        mountPath: /etc/deploy
-      env:
-        - name: PROJECT
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: IMAGE_PREFIX
-          value: ${IMAGE_PREFIX}
-        - name: IMAGE_VERSION
-          value: ${IMAGE_VERSION}
-        - name: MASTER_URL
-          value: ${MASTER_URL}
-        - name: REDEPLOY
-          value: ${REDEPLOY}
-        - name: USE_PERSISTENT_STORAGE
-          value: ${USE_PERSISTENT_STORAGE}
-        - name: HAWKULAR_METRICS_HOSTNAME
-          value: ${HAWKULAR_METRICS_HOSTNAME}
-        - name: CASSANDRA_NODES
-          value: ${CASSANDRA_NODES}
-        - name: CASSANDRA_PV_SIZE
-          value: ${CASSANDRA_PV_SIZE}
-        - name: METRIC_DURATION
-          value: ${METRIC_DURATION}
-    dnsPolicy: ClusterFirst
-    restartPolicy: Never
-    serviceAccount: metrics-deployer
-    volumes:
-    - name: empty
-      emptyDir: {}
-    - name: secret
-      secret:
-        secretName: metrics-deployer
-parameters:
--
-  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"'
-  name: IMAGE_PREFIX
-  value: "registry.access.redhat.com/openshift3/"
--
-  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"'
-  name: IMAGE_VERSION
-  value: "3.1.1"
--
-  description: "Internal URL for the master, for authentication retrieval"
-  name: MASTER_URL
-  value: "https://kubernetes.default.svc:443"
--
-  description: "External hostname where clients will reach Hawkular Metrics"
-  name: HAWKULAR_METRICS_HOSTNAME
-  required: true
--
-  description: "If set to true the deployer will try and delete all the existing components before trying to redeploy."
-  name: REDEPLOY
-  value: "false"
--
-  description: "Set to true for persistent storage, set to false to use non persistent storage"
-  name: USE_PERSISTENT_STORAGE
-  value: "true"
--
-  description: "The number of Cassandra Nodes to deploy for the initial cluster"
-  name: CASSANDRA_NODES
-  value: "1"
--
-  description: "The persistent volume size for each of the Cassandra nodes"
-  name: CASSANDRA_PV_SIZE
-  value: "10Gi"
--
-  description: "How many days metrics should be stored for."
-  name: METRIC_DURATION
-  value: "7"
diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml
deleted file mode 100644
index 9257b1f28..000000000
--- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/logging-deployer.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-apiVersion: "v1"
-kind: "Template"
-metadata:
-  name: logging-deployer-template
-  annotations:
-    description: "Template for deploying everything needed for aggregated logging. Requires cluster-admin 'logging-deployer' service account and 'logging-deployer' secret."
-    tags: "infrastructure"
-labels:
-  logging-infra: deployer
-  provider: openshift
-  component: deployer
-objects:
--
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    generateName: logging-deployer-
-  spec:
-    containers:
-    - image: ${IMAGE_PREFIX}logging-deployment:${IMAGE_VERSION}
-      imagePullPolicy: Always
-      name: deployer
-      volumeMounts:
-      - name: secret
-        mountPath: /secret
-        readOnly: true
-      - name: empty
-        mountPath: /etc/deploy
-      env:
-        - name: PROJECT
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: IMAGE_PREFIX
-          value: ${IMAGE_PREFIX}
-        - name: IMAGE_VERSION
-          value: ${IMAGE_VERSION}
-        - name: ENABLE_OPS_CLUSTER
-          value: ${ENABLE_OPS_CLUSTER}
-        - name: KIBANA_HOSTNAME
-          value: ${KIBANA_HOSTNAME}
-        - name: KIBANA_OPS_HOSTNAME
-          value: ${KIBANA_OPS_HOSTNAME}
-        - name: PUBLIC_MASTER_URL
-          value: ${PUBLIC_MASTER_URL}
-        - name: MASTER_URL
-          value: ${MASTER_URL}
-        - name: ES_INSTANCE_RAM
-          value: ${ES_INSTANCE_RAM}
-        - name: ES_CLUSTER_SIZE
-          value: ${ES_CLUSTER_SIZE}
-        - name: ES_NODE_QUORUM
-          value: ${ES_NODE_QUORUM}
-        - name: ES_RECOVER_AFTER_NODES
-          value: ${ES_RECOVER_AFTER_NODES}
-        - name: ES_RECOVER_EXPECTED_NODES
-          value: ${ES_RECOVER_EXPECTED_NODES}
-        - name: ES_RECOVER_AFTER_TIME
-          value: ${ES_RECOVER_AFTER_TIME}
-        - name: ES_OPS_INSTANCE_RAM
-          value: ${ES_OPS_INSTANCE_RAM}
-        - name: ES_OPS_CLUSTER_SIZE
-          value: ${ES_OPS_CLUSTER_SIZE}
-        - name: ES_OPS_NODE_QUORUM
-          value: ${ES_OPS_NODE_QUORUM}
-        - name: ES_OPS_RECOVER_AFTER_NODES
-          value: ${ES_OPS_RECOVER_AFTER_NODES}
-        - name: ES_OPS_RECOVER_EXPECTED_NODES
-          value: ${ES_OPS_RECOVER_EXPECTED_NODES}
-        - name: ES_OPS_RECOVER_AFTER_TIME
-          value: ${ES_OPS_RECOVER_AFTER_TIME}
-        - name: FLUENTD_NODESELECTOR
-          value: ${FLUENTD_NODESELECTOR}
-    dnsPolicy: ClusterFirst
-    restartPolicy: Never
-    serviceAccount: logging-deployer
-    volumes:
-    - name: empty
-      emptyDir: {}
-    - name: secret
-      secret:
-        secretName: logging-deployer
-parameters:
--
-  description: 'Specify prefix for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set prefix "openshift/origin-"'
-  name: IMAGE_PREFIX
-  value: "docker.io/openshift/origin-"
--
-  description: 'Specify version for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set version "v1.1"'
-  name: IMAGE_VERSION
-  value: "latest"
--
-  description: "If true, set up to use a second ES cluster for ops logs."
-  name: ENABLE_OPS_CLUSTER
-  value: "false"
--
-  description: "External hostname where clients will reach kibana"
-  name: KIBANA_HOSTNAME
-  required: true
--
-  description: "External hostname at which admins will visit the ops Kibana."
-  name: KIBANA_OPS_HOSTNAME
-  value: kibana-ops.example.com
--
-  description: "External URL for the master, for OAuth purposes"
-  name: PUBLIC_MASTER_URL
-  required: true
--
-  description: "Internal URL for the master, for authentication retrieval"
-  name: MASTER_URL
-  value: "https://kubernetes.default.svc.cluster.local"
--
-  description: "Amount of RAM to reserve per ElasticSearch instance."
-  name: ES_INSTANCE_RAM
-  value: "8G"
--
-  description: "How many instances of ElasticSearch to deploy."
-  name: ES_CLUSTER_SIZE
-  required: true
--
-  description: "Number of nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1."
-  name: ES_NODE_QUORUM
--
-  description: "Number of nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_CLUSTER_SIZE."
-  name: ES_RECOVER_AFTER_NODES
--
-  description: "Number of nodes desired to be present before the cluster will recover from a full restart. By default, ES_CLUSTER_SIZE."
-  name: ES_RECOVER_EXPECTED_NODES
--
-  description: "Timeout for *expected* nodes to be present when cluster is recovering from a full restart."
-  name: ES_RECOVER_AFTER_TIME
-  value: "5m"
--
-  description: "Amount of RAM to reserve per ops ElasticSearch instance."
-  name: ES_OPS_INSTANCE_RAM
-  value: "8G"
--
-  description: "How many ops instances of ElasticSearch to deploy. By default, ES_CLUSTER_SIZE."
-  name: ES_OPS_CLUSTER_SIZE
--
-  description: "Number of ops nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1."
-  name: ES_OPS_NODE_QUORUM
--
-  description: "Number of ops nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_OPS_CLUSTER_SIZE."
-  name: ES_OPS_RECOVER_AFTER_NODES
--
-  description: "Number of ops nodes desired to be present before the cluster will recover from a full restart. By default, ES_OPS_CLUSTER_SIZE."
-  name: ES_OPS_RECOVER_EXPECTED_NODES
--
-  description: "Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart."
-  name: ES_OPS_RECOVER_AFTER_TIME
-  value: "5m"
--
-  description: "The nodeSelector used for the Fluentd DaemonSet."
-  name: FLUENTD_NODESELECTOR
-  value: "logging-infra-fluentd=true"
diff --git a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/metrics-deployer.yaml
deleted file mode 100644
index 30d79acee..000000000
--- a/roles/openshift_examples/files/examples/v1.1/infrastructure-templates/origin/metrics-deployer.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
-# and other contributors as indicated by the @author tags.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-apiVersion: "v1"
-kind: "Template"
-metadata:
-  name: metrics-deployer-template
-  annotations:
-    description: "Template for deploying the required Metrics integration. Requires cluster-admin 'metrics-deployer' service account and 'metrics-deployer' secret."
-    tags: "infrastructure"
-labels:
-  metrics-infra: deployer
-  provider: openshift
-  component: deployer
-objects:
--
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    generateName: metrics-deployer-
-  spec:
-    containers:
-    - image: ${IMAGE_PREFIX}metrics-deployer:${IMAGE_VERSION}
-      name: deployer
-      volumeMounts:
-      - name: secret
-        mountPath: /secret
-        readOnly: true
-      - name: empty
-        mountPath: /etc/deploy
-      env:
-        - name: PROJECT
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: IMAGE_PREFIX
-          value: ${IMAGE_PREFIX}
-        - name: IMAGE_VERSION
-          value: ${IMAGE_VERSION}
-        - name: MASTER_URL
-          value: ${MASTER_URL}
-        - name: REDEPLOY
-          value: ${REDEPLOY}
-        - name: USE_PERSISTENT_STORAGE
-          value: ${USE_PERSISTENT_STORAGE}
-        - name: HAWKULAR_METRICS_HOSTNAME
-          value: ${HAWKULAR_METRICS_HOSTNAME}
-        - name: CASSANDRA_NODES
-          value: ${CASSANDRA_NODES}
-        - name: CASSANDRA_PV_SIZE
-          value: ${CASSANDRA_PV_SIZE}
-        - name: METRIC_DURATION
-          value: ${METRIC_DURATION}
-    dnsPolicy: ClusterFirst
-    restartPolicy: Never
-    serviceAccount: metrics-deployer
-    volumes:
-    - name: empty
-      emptyDir: {}
-    - name: secret
-      secret:
-        secretName: metrics-deployer
-parameters:
--
-  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"'
-  name: IMAGE_PREFIX
-  value: "openshift/origin-"
--
-  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"'
-  name: IMAGE_VERSION
-  value: "latest"
--
-  description: "Internal URL for the master, for authentication retrieval"
-  name: MASTER_URL
-  value: "https://kubernetes.default.svc:443"
--
-  description: "External hostname where clients will reach Hawkular Metrics"
-  name: HAWKULAR_METRICS_HOSTNAME
-  required: true
--
-  description: "If set to true the deployer will try and delete all the existing components before trying to redeploy."
-  name: REDEPLOY
-  value: "false"
--
-  description: "Set to true for persistent storage, set to false to use non persistent storage"
-  name: USE_PERSISTENT_STORAGE
-  value: "true"
--
-  description: "The number of Cassandra Nodes to deploy for the initial cluster"
-  name: CASSANDRA_NODES
-  value: "1"
--
-  description: "The persistent volume size for each of the Cassandra nodes"
-  name: CASSANDRA_PV_SIZE
-  value: "10Gi"
--
-  description: "How many days metrics should be stored for."
-  name: METRIC_DURATION
-  value: "7"