Tech Rev 2: removed many ifdefs, removed first steps, fixed broken links

Author: Timothy Poitras

_build_cfg.yml

@@ -170,19 +170,16 @@ Topics:
         File: docker_registry
       - Name: Deploying a Router
         File: deploy_router
-      - Name: First Steps
-        File: first_steps
-        Distros: openshift-origin
   - Name: Upgrading
     File: upgrades
   - Name: Downgrading
     File: downgrade
     Distros: openshift-enterprise
   - Name: Master and Node Configuration
     File: master_node_configuration
-  - Name: Default Image Streams and Templates
-    File: default_imagestreams_templates
-    Distros: openshift-enterprise
+  - Name: Image Streams and Templates
+    File: imagestreams_templates
+    Distros: openshift-enterprise,openshift-origin
   - Name: Configuring Custom Certificates
     File: certificate_customization
   - Name: Configuring Authentication

architecture/core_concepts/templates.adoc

@@ -88,7 +88,7 @@ application.
 Templates can be processed from a definition in a file or
 from an existing OpenShift API object.  Cluster administrators can
 ifdef::openshift-origin[]
-link:../../install_config/install/first_steps.html#creating-instantapp-templates[define standard templates in the API]
+link:../../install_config/imagestreams_templates.html#creating-instantapp-templates[define standard templates in the API]
 endif::[]
 ifdef::openshift-enterprise[]
 link:../../install_config/default_imagestreams_templates.html#creating-instantapp-templates[define standard templates in the API]

dev_guide/templates.adoc

@@ -249,14 +249,9 @@ You can list the available default InstantApp templates with:
 $ oc get templates -n openshift
 ----
 
-ifdef::openshift-origin[]
 If they are not available, direct your cluster administrator to the
-link:../install_config/install/first_steps.html[First Steps] topic.
-endif::[]
-ifdef::openshift-enterprise[]
-If they are not available, direct your cluster administrator to the
-link:../install_config/default_imagestreams_templates.html[Default Image Streams and Templates] topic.
-endif::[]
+link:../install_config/imagestreams_templates.html[Image Streams and Templates] 
+topic.
 
 By default, the templates build using a public source repository on
 https://github.com[GitHub] that contains the necessary application code. In

getting_started/developers/developers_cli.adoc

@@ -59,14 +59,8 @@ endif::openshift-dedicated[]
 
 - Your instance must be pre-configured by a cluster administrator with the InstantApp templates and builder images. If they
 are not available,
-ifdef::openshift-origin[]
 direct your cluster administrator to the
-link:../../install_config/install/first_steps.html[First Steps] topic.
-endif::[]
-ifdef::openshift-enterprise[]
-direct your cluster administrator to the
-link:../../install_config/default_imagestreams_templates.html[Default Image Streams and Templates] topic.
-endif::[]
+link:../install_config/imagestreams_templates.html[Image Streams and Templates] topic.
 ifdef::openshift-dedicated[]
 contact your cluster administrator.
 endif::[]

install_config/default_imagestreams_templates.adoc renamed to install_config/imagestreams_templates.adoc

@@ -1,4 +1,4 @@
-= Default Image Streams and Templates
+= Image Streams and Templates
 {product-author}
 {product-version}
 :data-uri:
@@ -10,8 +10,6 @@
 
 toc::[]
 
-// tag::firststeps[]
-
 == Overview
 
 ifdef::openshift-enterprise[]
@@ -26,19 +24,24 @@ default global project to which all users have view access.
 endif::[]
 
 ifdef::openshift-origin[]
-You can populate your OpenShift installation with a useful set of Red
-Hat-provided
-link:../../architecture/core_concepts/builds_and_image_streams.html#image-streams[image
-streams] and link:../../architecture/core_concepts/templates.html[templates] to
+You can populate your OpenShift installation with a useful set of
+Red Hat-provided
+link:../architecture/core_concepts/builds_and_image_streams.html#image-streams[image streams] and
+link:../architecture/core_concepts/templates.html[templates] to
 make it easy for developers to create new applications. By default, the
-link:advanced_install.html[advanced installation] method automatically creates
+link:../install_config/install/advanced_install.html[advanced installation] method automatically creates
 these sets in the *openshift* project, which is a default project to which all
 users have view access.
 endif::[]
 
 ifdef::openshift-enterprise[]
-The core set of image streams and templates are provided and supported by Red Hat
-with an active OpenShift Enterprise subscription for the following technologies:
+The core set of image streams and templates are provided and supported by
+Red Hat with an active OpenShift Enterprise subscription for the following
+technologies:
+endif::[]
+ifdef::openshift-origin[]
+Image streams and templates are provided for the following technologies:
+endif::[]
 
 [horizontal]
 Languages::
@@ -53,25 +56,6 @@ Database::
 - link:../using_images/db_images/postgresql.html[PostgreSQL]
 Other Services::
 - link:../using_images/other_images/jenkins.html[Jenkins]
-endif::[]
-
-ifdef::openshift-origin[]
-Image streams and templates are provided for the following technologies:
-
-[horizontal]
-Languages::
-- link:../../using_images/s2i_images/nodejs.html[Node.js]
-- link:../../using_images/s2i_images/perl.html[Perl]
-- link:../../using_images/s2i_images/php.html[PHP]
-- link:../../using_images/s2i_images/python.html[Python]
-- link:../../using_images/s2i_images/ruby.html[Ruby]
-Database::
-- link:../../using_images/db_images/mongodb.html[MongoDB]
-- link:../../using_images/db_images/mysql.html[MySQL]
-- link:../../using_images/db_images/postgresql.html[PostgreSQL]
-Other Services::
-- link:../../using_images/other_images/jenkins.html[Jenkins]
-endif::[]
 
 ifdef::openshift-enterprise[]
 If you also have the relevant xPaaS Middleware subscription active on your
@@ -101,12 +85,9 @@ The JSON object definitions used to create these sets are installed on the file
 system of your master during
 ifdef::openshift-enterprise[]
 a link:../install_config/install/quick_install.html[quick] or
-link:../install_config/install/advanced_install.html[advanced installation].
-endif::[]
-ifdef::openshift-origin[]
-an link:../../install_config/install/advanced_install.html[advanced
-installation].
 endif::[]
+an
+link:../install_config/install/advanced_install.html[advanced installation].
 If you used another method to install, or if the default image streams and
 templates are ever removed or changed, you can use the following instructions to
 create the default objects yourself. Otherwise, the following instructions are
@@ -119,31 +100,12 @@ Before you can create the default image streams and templates (if they do not
 already exist):
 
 - The
-ifdef::openshift-enterprise[]
 link:../install_config/install/docker_registry.html[integrated Docker registry]
-endif::[]
-ifdef::openshift-origin[]
-link:../../install_config/install/docker_registry.html[integrated Docker
-registry]
-endif::[]
-service must be
-deployed in your OpenShift installation.
+service must be deployed in your OpenShift installation.
 - You must be able to run the following CLI commands with
-ifdef::openshift-enterprise[]
-link:../architecture/additional_concepts/authorization.html#roles[*cluster-admin*
-privileges],
-endif::[]
-ifdef::openshift-origin[]
-link:../../architecture/additional_concepts/authorization.html#roles[*cluster-admin*
-privileges],
-endif::[]
+link:../architecture/additional_concepts/authorization.html#roles[*cluster-admin* privileges],
 because they operate on the default *openshift*
-ifdef::openshift-enterprise[]
 link:../architecture/core_concepts/projects_and_users.html#projects[project].
-endif::[]
-ifdef::openshift-origin[]
-link:../../architecture/core_concepts/projects_and_users.html#projects[project].
-endif::[]
 ifdef::openshift-origin[]
 - You must have cloned the
 https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_examples/files[repository]
@@ -156,8 +118,8 @@ $ git clone https://github.com/openshift/openshift-ansible
 endif::[]
 ifdef::openshift-enterprise[]
 - You must have installed the *atomic-openshift-utils* RPM package. See
-link:../install_config/install/prerequisites.html#software-prerequisites[Software
-Prerequisites] for instructions.
+link:../install_config/install/prerequisites.html#software-prerequisites[Software Prerequisites]
+for instructions.
 endif::[]
 - Define shell variables for the directories containing image streams and templates. This significantly shortens the commands in the following sections. To do this:
 +
@@ -182,7 +144,6 @@ endif::[]
 
 == Creating Image Streams for OpenShift Images
 The core set of image streams provide images that can be used to build
-ifdef::openshift-enterprise[]
 link:../using_images/s2i_images/nodejs.html[*Node.js*],
 link:../using_images/s2i_images/perl.html[*Perl*],
 link:../using_images/s2i_images/php.html[*PHP*],
@@ -191,17 +152,6 @@ link:../using_images/s2i_images/ruby.html[*Ruby*] applications. It also
 defines images for link:../using_images/db_images/mongodb.html[*MongoDB*],
 link:../using_images/db_images/mysql.html[*MySQL*], and
 link:../using_images/db_images/postgresql.html[*PostgreSQL*]
-endif::[]
-ifdef::openshift-origin[]
-link:../../using_images/s2i_images/nodejs.html[*Node.js*],
-link:../../using_images/s2i_images/perl.html[*Perl*],
-link:../../using_images/s2i_images/php.html[*PHP*],
-link:../../using_images/s2i_images/python.html[*Python*], and
-link:../../using_images/s2i_images/ruby.html[*Ruby*] applications. It also
-defines images for link:../../using_images/db_images/mongodb.html[*MongoDB*],
-link:../../using_images/db_images/mysql.html[*MySQL*], and
-link:../../using_images/db_images/postgresql.html[*PostgreSQL*]
-endif::[]
 to support data storage.
 
 If your node hosts are subscribed using Red Hat Subscription Manager and you
@@ -252,16 +202,9 @@ endif::[]
 == Creating Database Service Templates
 The database service templates make it easy to run a database image which can be
 utilized by other components. For each database
-ifdef::openshift-enterprise[]
 (link:../using_images/db_images/mongodb.html[*MongoDB*],
 link:../using_images/db_images/mysql.html[*MySQL*], and
 link:../using_images/db_images/postgresql.html[*PostgreSQL*]),
-endif::[]
-ifdef::openshift-origin[]
-(link:../../using_images/db_images/mongodb.html[*MongoDB*],
-link:../../using_images/db_images/mysql.html[*MySQL*], and
-link:../../using_images/db_images/postgresql.html[*PostgreSQL*]),
-endif::[]
 two templates are defined.
 
 One template uses ephemeral storage in the container which means data stored
@@ -270,12 +213,7 @@ template should be used for demonstration purposes only.
 
 The other template defines a persistent volume for storage, however it requires
 your OpenShift installation to have
-ifdef::openshift-enterprise[]
 link:../install_config/persistent_storage/persistent_storage_nfs.html[persistent volumes]
-endif::[]
-ifdef::openshift-origin[]
-link:../../install_config/persistent_storage/persistent_storage_nfs.html[persistent volumes]
-endif::[]
 configured.
 
 To create the core set of database templates:
@@ -293,39 +231,14 @@ templates, giving them quick access to a database deployment.
 The InstantApp templates define a full set of objects for a running application.
 These include:
 
-ifdef::openshift-enterprise[]
 - link:../architecture/core_concepts/builds_and_image_streams.html#builds[Build configurations]
-endif::[]
-ifdef::openshift-origin[]
-- link:../../architecture/core_concepts/builds_and_image_streams.html#builds[Build configurations]
-endif::[]
 to build the application from source located in a GitHub public repository
-ifdef::openshift-enterprise[]
 - link:../architecture/core_concepts/deployments.html#deployments-and-deployment-configurations[Deployment configurations]
-endif::[]
-ifdef::openshift-origin[]
-- link:../../architecture/core_concepts/deployments.html#deployments-and-deployment-configurations[Deployment configurations]
-endif::[]
 to deploy the application image after it is built.
-ifdef::openshift-enterprise[]
 - link:../architecture/core_concepts/pods_and_services.html#services[Services]
-endif::[]
-ifdef::openshift-origin[]
-- link:../../architecture/core_concepts/pods_and_services.html#services[Services]
-endif::[]
 to provide load balancing for the application
-ifdef::openshift-enterprise[]
 link:../architecture/core_concepts/pods_and_services.html#pods[pods].
-endif::[]
-ifdef::openshift-origin[]
-link:../../architecture/core_concepts/pods_and_services.html#pods[pods].
-endif::[]
-ifdef::openshift-enterprise[]
 - link:../architecture/core_concepts/routes.html[Routes]
-endif::[]
-ifdef::openshift-origin[]
-- link:../../architecture/core_concepts/routes.html[Routes]
-endif::[]
 to provide external access to the application.
 
 Some of the templates also define a database deployment and service so the
@@ -385,19 +298,9 @@ endif::[]
 == What's Next?
 
 With these artifacts created, developers can now
-ifdef::openshift-enterprise[]
 link:../dev_guide/authentication.html[log into the web console]
-endif::[]
-ifdef::openshift-origin[]
-link:../../dev_guide/authentication.html[log into the web console]
-endif::[]
 and follow the flow for
-ifdef::openshift-enterprise[]
 link:../dev_guide/templates.html#creating-from-templates-using-the-web-console[creating from a template].
-endif::[]
-ifdef::openshift-origin[]
-link:../../dev_guide/templates.html#creating-from-templates-using-the-web-console[creating from a template].
-endif::[]
 Any of the database or application templates can be selected
 to create a running database service or application in the current project. Note
 that some of the application templates define their own database services as
@@ -411,11 +314,5 @@ creating from the templates. This allows developers to experiment with creating
 their own applications.
 
 You can direct your developers to the
-ifdef::openshift-enterprise[]
 link:../dev_guide/templates.html#using-the-instantapp-templates[Using the InstantApp Templates]
-endif::[]
-ifdef::openshift-origin[]
-link:../../dev_guide/templates.html#using-the-instantapp-templates[Using the InstantApp Templates]
-endif::[]
 section in the Developer Guide for these instructions.
-// end::firststeps[]

install_config/install/advanced_install.adoc

@@ -1092,5 +1092,6 @@ endif::[]
 - Deploy an link:docker_registry.html[integrated Docker registry].
 - Deploy a link:deploy_router.html[router].
 ifdef::openshift-origin[]
-- link:../../install_config/install/first_steps.html[Populate your OpenShift installation] with a useful set of Red Hat-provided image streams and templates.
+- link:../../install_config/imagestreams_templates.html[Populate your OpenShift installation] 
+with a useful set of Red Hat-provided image streams and templates.
 endif::[]

install_config/install/deploy_router.adoc

@@ -827,6 +827,6 @@ All].
 endif::[]
 - Deploy an link:docker_registry.html[integrated Docker registry].
 ifdef::openshift-origin[]
-- link:../../install_config/install/first_steps.html[Populate your OpenShift installation] with a useful set
-of Red Hat-provided image streams and templates.
+- link:../../install_config/imagestreams_templates.html[Populate your OpenShift installation] 
+with a useful set of Red Hat-provided image streams and templates.
 endif::[]

install_config/install/docker_registry.adoc

@@ -704,6 +704,6 @@ All].
 endif::[]
 - Deploy a link:deploy_router.html[router].
 ifdef::openshift-origin[]
-- link:../../install_config/install/first_steps.html[Populate your OpenShift installation] with a useful set
-of Red Hat-provided image streams and templates.
+- link:../../install_config/imagestreams_templates.html[Populate your OpenShift installation] 
+with a useful set of Red Hat-provided image streams and templates.
 endif::[]

install_config/install/first_steps.adoc

@@ -307,7 +307,7 @@ All].
 - Deploy an link:docker_registry.html[integrated Docker registry].
 - Deploy a link:deploy_router.html[router].
 \\\\
-- link:first_steps.html[Populate your OpenShift installation] with a useful set
-of Red Hat-provided image streams and templates.
+- link:../../install_config/imagestreams_templates.html[Populate your OpenShift installation] 
+with a useful set of Red Hat-provided image streams and templates.
 \\\\
 endif::[]