Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-08-04 17:05:49 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-08-04 17:05:49 +0300
commitf0e58a3bdf7d0a35b32bd5debb0ff80062361df6 (patch)
treecd600c14dfacbcab364b599e5df5dac92a7bf05b /doc
parent3ec93e79de20bdc61594daf63766df7e6cbd20aa (diff)
Fix different Markdown styles
Diffstat (limited to 'doc')
-rw-r--r--doc/articles/index.md2
-rw-r--r--doc/articles/openshift_and_gitlab/index.md30
2 files changed, 4 insertions, 28 deletions
diff --git a/doc/articles/index.md b/doc/articles/index.md
index 335cb4f177b..558c624fe39 100644
--- a/doc/articles/index.md
+++ b/doc/articles/index.md
@@ -80,7 +80,7 @@ Install, upgrade, integrate, migrate to GitLab:
| :------------ | :------: | --------------: |
| [Video Tutorial: Idea to Production on Google Container Engine (GKE)](https://about.gitlab.com/2017/01/23/video-tutorial-idea-to-production-on-google-container-engine-gke/) | Tutorial | 2017/01/23 |
| [How to Setup a GitLab Instance on Microsoft Azure](https://about.gitlab.com/2016/07/13/how-to-setup-a-gitlab-instance-on-microsoft-azure/) | Tutorial | 2016/07/13 |
-| [Get started with OpenShift Origin 3 and GitLab](https://docs.gitlab.com/ee/articles/openshift_and_gitlab/) | Tutorial | 2016/06/28 |
+| [Get started with OpenShift Origin 3 and GitLab](openshift_and_gitlab/index.md) | Tutorial | 2016/06/28 |
| [Getting started with GitLab and DigitalOcean](https://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/) | Tutorial | 2016/04/27 |
## Software development
diff --git a/doc/articles/openshift_and_gitlab/index.md b/doc/articles/openshift_and_gitlab/index.md
index 96a83089670..7f76e577efa 100644
--- a/doc/articles/openshift_and_gitlab/index.md
+++ b/doc/articles/openshift_and_gitlab/index.md
@@ -5,7 +5,6 @@
> **Author:** [Achilleas Pipinellis](https://gitlab.com/axil) ||
> **Publication date:** 2016/06/28
-
## Introduction
[OpenShift Origin][openshift] is an open source container application
@@ -18,14 +17,6 @@ tools that will help us achieve our goal.
---
-### What's on this page?
-{: .no_toc}
-
-- TOC
-{:toc}
-
----
-
## Prerequisites
OpenShift 3 is not yet deployed on RedHat's offered Online platform ([openshift.com]),
@@ -45,16 +36,11 @@ latest Origin release is used:
- **openshift** `v1.3.0` (is pre-installed in the [VM image][vm-new])
- **kubernetes** `v1.3.0` (is pre-installed in the [VM image][vm-new])
-<div class="panel panel-info">
-**Note**
-{: .panel-heading}
-<div class="panel-body">
+>**Note:**
If you intend to deploy GitLab on a production OpenShift cluster, there are some
limitations to bare in mind. Read on the [limitations](#current-limitations)
section for more information and follow the linked links for the relevant
discussions.
-</div>
-</div>
Now that you have all batteries, let's see how easy it is to test OpenShift
on your computer.
@@ -268,10 +254,7 @@ And then let's import it in OpenShift:
oc create -f openshift-template.json -n openshift
```
-<div class="panel panel-info">
-**Note**
-{: .panel-heading}
-<div class="panel-body">
+>**Note:**
The `-n openshift` namespace flag is a trick to make the template available to all
projects. If you recall from when we created the `gitlab` project, `oc` switched
to it automatically, and that can be verified by the `oc status` command. If
@@ -279,8 +262,6 @@ you omit the namespace flag, the application will be available only to the
current project, in our case `gitlab`. The `openshift` namespace is a global
one that the administrators should use if they want the application to be
available to all users.
-</div>
-</div>
We are now ready to finally deploy GitLab!
@@ -320,16 +301,11 @@ If you are deploying to production you will want to change the **GitLab instance
hostname** and use greater values for the volume sizes. If you don't provide a
password for PostgreSQL, it will be created automatically.
-<div class="panel panel-info">
-**Note**
-{: .panel-heading}
-<div class="panel-body">
+>**Note:**
The `gitlab.apps.10.2.2.2.xip.io` hostname that is used by default will
resolve to the host with IP `10.2.2.2` which is the IP our VM uses. It is a
trick to have distinct FQDNs pointing to services that are on our local network.
Read more on how this works in <http://xip.io>.
-</div>
-</div>
Now that we configured this, let's see how to manage and scale GitLab.