From e352e4d9436349d5a66265fba8c6c0cb1ae76b7d Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Dec 02 2019 08:31:27 +0000
Subject: Update the OSBS SOP


Signed-off-by: Clement Verna <cverna@tutanota.com>

---

diff --git a/docs/sysadmin-guide/sops/layered-image-buildsys.rst b/docs/sysadmin-guide/sops/layered-image-buildsys.rst
index 14185b6..bcdc690 100644
--- a/docs/sysadmin-guide/sops/layered-image-buildsys.rst
+++ b/docs/sysadmin-guide/sops/layered-image-buildsys.rst
@@ -25,7 +25,7 @@ Contact Information
 ===================
 
 Owner
-    Adam Miller (maxamillion)
+    Clement Verna (cverna)
 
 Contact
     #fedora-admin, #fedora-releng, #fedora-noc, sysadmin-main, sysadmin-releng
@@ -47,10 +47,10 @@ Overview
 ========
 
 The build system is setup such that Fedora Layered Image maintainers will submit
-a build to Koji via the ``fedpkg container-build`` command a ``docker``
+a build to Koji via the ``fedpkg container-build`` command a ``container``
 namespace within `DistGit`_. This will trigger the build to be scheduled in
 `OpenShift`_ via `osbs-client`_ tooling, this will create a custom
-`OpenShift Build`_ which will use the pre-made buildroot `Docker`_ image that we
+`OpenShift Build`_ which will use the pre-made buildroot container image that we
 have created. The `Atomic Reactor`_ (``atomic-reactor``) utility will run within
 the buildroot and prep the build container where the actual build action will
 execute, it will also maintain uploading the `Content Generator`_ metadata back
@@ -60,15 +60,7 @@ this is how we will further limit the access of the buildroot to the outside
 world verifying that all sources of information come from Fedora.
 
 Completed layered image builds are hosted in a candidate docker registry which
-is then used to pull the image and perform tests with `Taskotron`_. The
-taskotron tests are triggered by a `fedmsg`_ message that is emitted from
-`Koji`_ once the build is complete. Once the test is complete, taskotron will
-send fedmsg which is then caught by the `RelEng Automation`_ Engine that will
-run the Automatic Release tasks in order to push the layered image into a stable
-docker registry in the production space for end users to consume.
-
-For more information, please consult the `RelEng Architecture Document`_.
-
+is then used to pull the image and perform tests.
 
 Setup
 =====
@@ -122,9 +114,12 @@ available in the `RelEng Architecture Document`_):
 Deployment
 ----------
 The osbs-control01 host is where the `ansible-ansible-openshift-ansible`_ role
-is called from the `osbs-cluster.yml`_ playbook in order to configure the
+is called from the `groups/osbs/deploy-cluster.yml`_ playbook in order to configure the
 OpenShift Cluster where OSBS is deployed on top of.
 
+To apply the OSBS configuration to the OpenShift cluster the `groups/osbs/configure-osbs.yml`
+playbook is used.
+
 
 Operation
 ---------
@@ -265,7 +260,6 @@ to normal.
     https://github.com/projectatomic/osbs-client
 .. _fedmsg: http://www.fedmsg.com/en/latest/
 .. _Koji: https://fedoraproject.org/wiki/Koji
-.. _Docker: https://github.com/docker/docker/
 .. _OpenShift: https://www.openshift.org/
 .. _Taskotron: https://taskotron.fedoraproject.org/
 .. _docker-registry: https://docs.docker.com/registry/
@@ -274,14 +268,16 @@ to normal.
 .. _docker-distribution: https://github.com/docker/distribution/
 .. _Atomic Reactor: https://github.com/projectatomic/atomic-reactor
 .. _DistGit:
-    https://fedoraproject.org/wiki/Infrastructure/VersionControl/dist-git
+    https://src.fedoraproject.org/projects/container/*
 .. _OpenShift Build:
     https://docs.openshift.org/latest/dev_guide/builds.html
 .. _Content Generator:
     https://fedoraproject.org/wiki/Koji/ContentGenerators
 .. _RelEng Architecture Document:
     https://docs.pagure.org/releng/layered_image_build_service.html
-.. _osbs-cluster.yml:
-    https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/playbooks/groups/osbs-cluster.yml
+.. _groups/osbs/deploy-cluster.yml:
+    https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/playbooks/groups/osbs/deploy-cluster.yml
+.. _groups/osbs/configure-osbs.yml:
+    https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/playbooks/groups/osbs/configure-osbs.yml
 .. _ansible-ansible-openshift-ansible:
     https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/ansible-ansible-openshift-ansible