Skip to content

Commit 8926ec5

Browse files
author
Timothy Poitras
committed
Revisions per tech review openshift#3: topic rename, added Before You Begin section, fixed errant ifdef/endif
1 parent 990503f commit 8926ec5

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

_build_cfg.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ Topics:
177177
Distros: openshift-enterprise
178178
- Name: Master and Node Configuration
179179
File: master_node_configuration
180-
- Name: Image Streams and Templates
180+
- Name: Loading Image Streams and Templates
181181
File: imagestreams_templates
182-
Distros: openshift-enterprise,openshift-origin
183182
- Name: Configuring Custom Certificates
184183
File: certificate_customization
185184
- Name: Configuring Authentication

architecture/core_concepts/templates.adoc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,11 @@ application.
8787

8888
Templates can be processed from a definition in a file or
8989
from an existing OpenShift API object. Cluster administrators can
90-
ifdef::openshift-origin[]
9190
link:../../install_config/imagestreams_templates.html#creating-instantapp-templates[define standard templates in the API]
92-
endif::[]
93-
ifdef::openshift-enterprise[]
94-
link:../../install_config/default_imagestreams_templates.html#creating-instantapp-templates[define standard templates in the API]
95-
endif::[]
9691
ifdef::openshift-dedicated[]
9792
define standard templates in the API
9893
endif::[]
99-
that are
100-
available for all users to process, while users can
94+
that are available for all users to process, while users can
10195
link:../../dev_guide/templates.html#uploading-a-template[define their
10296
own templates] within their own projects.
10397

install_config/imagestreams_templates.adoc

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Image Streams and Templates
1+
= Loading Image Streams and Templates
22
{product-author}
33
{product-version}
44
:data-uri:
@@ -13,18 +13,18 @@ toc::[]
1313
== Overview
1414

1515
ifdef::openshift-enterprise[]
16-
Your OpenShift installation includes a useful set of Red Hat-provided
16+
Your OpenShift installation includes useful sets of Red Hat-provided
1717
link:../architecture/core_concepts/builds_and_image_streams.html#image-streams[image
1818
streams] and link:../architecture/core_concepts/templates.html[templates] to
1919
make it easy for developers to create new applications. By default, the
2020
link:../install_config/install/quick_install.html[quick installation] and
2121
link:../install_config/install/advanced_install.html[advanced installation]
2222
methods automatically create these sets in the *openshift* project, which is a
23-
default global project to which all users have view access.
23+
default global project to which all users have view access.
2424
endif::[]
2525

2626
ifdef::openshift-origin[]
27-
You can populate your OpenShift installation with a useful set of
27+
You can populate your OpenShift installation with useful sets of
2828
Red Hat-provided
2929
link:../architecture/core_concepts/builds_and_image_streams.html#image-streams[image streams] and
3030
link:../architecture/core_concepts/templates.html[templates] to
@@ -72,32 +72,40 @@ Middleware Services::
7272
- link:../using_images/xpaas_images/data_grid.html[JBoss Data Grid]
7373
endif::[]
7474

75-
You can check which default image streams and templates are currently available
76-
in your OpenShift environment by logging into the web console and clicking *Add
77-
to Project*, or getting the lists for the *openshift* project using the CLI:
75+
[[before-you-begin-istemps]]
76+
== Before You Begin
7877

78+
Before you consider using the `oc create` commands contained within this topic,
79+
confirm if these sets are already registered in your cluster.
80+
To check which image streams and templates are currently available
81+
in your OpenShift environment you can:
82+
83+
* Log into the web console and click *Add to Project*.
84+
+
85+
Or,
86+
* List them for the *openshift* project using the CLI:
87+
+
7988
----
8089
$ oc get is -n openshift
8190
$ oc get templates -n openshift
8291
----
8392

84-
The JSON object definitions used to create these sets are installed on the file
85-
system of your master during
93+
The JSON object definitions used to create these sets are automatically
94+
installed on the file system of your master during
8695
ifdef::openshift-enterprise[]
8796
a link:../install_config/install/quick_install.html[quick] or
8897
endif::[]
8998
an
9099
link:../install_config/install/advanced_install.html[advanced installation].
91100
If you used another method to install, or if the default image streams and
92-
templates are ever removed or changed, you can use the following instructions to
101+
templates are ever removed or changed, you can follow this topic to
93102
create the default objects yourself. Otherwise, the following instructions are
94103
not necessary.
95104

96105
[[is-templates-prereqs]]
97106
== Prerequisites
98107

99-
Before you can create the default image streams and templates (if they do not
100-
already exist):
108+
Before you can create the default image streams and templates:
101109

102110
- The
103111
link:../install_config/install/docker_registry.html[integrated Docker registry]

0 commit comments

Comments
 (0)