diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /doc/install/openshift_and_gitlab/index.md | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'doc/install/openshift_and_gitlab/index.md')
-rw-r--r-- | doc/install/openshift_and_gitlab/index.md | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md index 7ac5aa6667a..2d7389a48a0 100644 --- a/doc/install/openshift_and_gitlab/index.md +++ b/doc/install/openshift_and_gitlab/index.md @@ -183,9 +183,9 @@ Using the all-in-one VM gives you the ability to test OpenShift whenever you want. That means you get to play with it, shutdown the VM, and pick up where you left off. -Sometimes though, you may encounter some issues, like OpenShift not running -when booting up the VM. The web UI may not responding or you may see issues -when trying to login with `oc`, like: +Occasionally, you may encounter issues, like OpenShift not running when booting +up the VM. The web UI may not respond, or you may see issues when trying to sign +in with `oc`, like: ```plaintext The connection to the server 10.2.2.2:8443 was refused - did you specify the right host or port? @@ -213,8 +213,7 @@ In that case, the OpenShift service might not be running, so in order to fix it: systemctl status openshift -l ``` -Now you will be able to login using `oc` (like we did before) and visit the web -console. +You can now sign in by using `oc` (like we did before) and visit the web console. ## Deploy GitLab @@ -497,14 +496,13 @@ oc adm policy add-scc-to-user anyuid system:serviceaccount:gitlab:gitlab-ce-user ## Conclusion -By now, you should have an understanding of the basic OpenShift Origin concepts -and a sense of how things work using the web console or the CLI. +You should now have an understanding of the basic OpenShift Origin concepts, and +a sense of how things work using the web console or the CLI. -GitLab was hard to install in previous versions of OpenShift, -but now that belongs to the past. Upload a template, create a project, add an -application and you are done. You are ready to login to your new GitLab instance. +Upload a template, create a project, add an application, and you're done. You're +ready to sign in to your new GitLab instance. -And remember that in this tutorial we just scratched the surface of what Origin -is capable of. As always, you can refer to the detailed -[documentation](https://docs.okd.io) to learn more about deploying your own OpenShift -PaaS and managing your applications with the ease of containers. +Remember that this tutorial doesn't address all that Origin is capable of. As +always, refer to the detailed [documentation](https://docs.okd.io) to learn more +about deploying your own OpenShift PaaS and managing your applications with +containers. |