Skip to content

Commit

Permalink
changes after dev suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
bfallonf committed Apr 27, 2015
1 parent d7aae5d commit 9ccc435
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
18 changes: 6 additions & 12 deletions architecture/core_objects/overview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,14 @@
:icons:
:experimental:

The following sections give some information about general OpenShift and
Kubernetes architecture and terms. The
link:../architecture/core_objects/kubernetes_model.html[Kubernetes Model]
section outlines how the Kubernetes infrastructure is used in your OpenShift
instance. The link:../architecture/core_objects/openshift-model.html[OpenShift
Model] section outlines any OpenShift-specific information about your
infrastructure.
The link:kubernetes_model.html[Kubernetes model] topic provides information
about important resources of your OpenShift instance, which is extended by the
link:openshift_model[OpenShift model] topic.

The link:../architecture/core_objects/builds.html[Builds] section outlines how
to create a working image from a build object, and the
link:../architecture/core_objects/routing.html[Routing] seciton outlines the
link:../architecture/core_objects/routing.html[Routing] section outlines the
routing process.

A number of Kubernetes objects can be created by utilizing templates.

See the link:../dev_guide/templates.html[Templates] section for more
information.
You can create many of these resources by utilizing
link:../dev_guide/templates.html[Templates].
4 changes: 4 additions & 0 deletions dev_guide/console.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@ image:console_filter_step3.png["Console Filter Step 3"]
image:console_filter_active.png["Console Filter Active"]
====

== Creating a Configuration From a Template
You can create many important Kubernetes and OpenShift resources from the
Management Console by utilizing link:../dev_guide/templates.html[Templates].
6 changes: 4 additions & 2 deletions dev_guide/templates.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ Create a template JSON file, like the above example, then upload it with the
CLI using the following process:

=== Uploading a Template
You can upload a template to your current project's template library by passing a JSON file with the following command:
You can upload a template to your current project's template library by passing
a JSON file with the following command:

****
`osc create -f _<filename>_`
Expand All @@ -81,7 +82,8 @@ name of the project:
The template is now available to be selected for a configuration using the
Management Console or the CLI.

Alternatively, you can upload a template then create from the same template by piping both commands:
Alternatively, you can upload a template then create from the same template by
piping both commands:

****
`osc process -f _<filename.json>_ | osc create -f -`
Expand Down

0 comments on commit 9ccc435

Please sign in to comment.