summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-04 11:57:55 -0500
committerGitHub <noreply@github.com>2017-01-04 11:57:55 -0500
commitc85b26d8e1733118682cbec2c8f01885e42b7e7c (patch)
treede8c0c5f82abb22a42b95b96505cd4f1d6c88ab5
parentd234e53efcc5c7fb7b97fc7fb9105e8a9b8ae266 (diff)
parent3171c1c3a5a42a9cd68ef06db3a81c0ac1abe836 (diff)
downloadopenshift-c85b26d8e1733118682cbec2c8f01885e42b7e7c.tar.gz
openshift-c85b26d8e1733118682cbec2c8f01885e42b7e7c.tar.bz2
openshift-c85b26d8e1733118682cbec2c8f01885e42b7e7c.tar.xz
openshift-c85b26d8e1733118682cbec2c8f01885e42b7e7c.zip
Merge pull request #3035 from simaishi/update_to_ga_template
Update CFME template to point to GA build
-rw-r--r--roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml (renamed from roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml)10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml b/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml
index e22547692..c8e3d4083 100644
--- a/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml
+++ b/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Template
labels:
- template: cloudforms-beta
+ template: cloudforms
metadata:
- name: cloudforms-beta
+ name: cloudforms
annotations:
description: "CloudForms appliance with persistent storage"
tags: "instant-app,cloudforms,cfme"
@@ -48,7 +48,7 @@ objects:
annotations:
description: "Keeps track of changes in the CloudForms app image"
spec:
- dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-app
+ dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-app
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -188,7 +188,7 @@ objects:
annotations:
description: "Keeps track of changes in the CloudForms memcached image"
spec:
- dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-memcached
+ dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-memcached
- apiVersion: v1
kind: "DeploymentConfig"
metadata:
@@ -272,7 +272,7 @@ objects:
annotations:
description: "Keeps track of changes in the CloudForms postgresql image"
spec:
- dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-postgresql
+ dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-postgresql
- apiVersion: v1
kind: "DeploymentConfig"
metadata: