(DOCSP-12930) Clarify that Atlas orgs are not supported (#416)

JuliaMongo · web-flow · commit 3400540f10c4 · 2020-11-18T11:47:55.000-05:00
* (DOCSP-12930) Clarify that Atlas orgs are not supported * (DOCSP-12930) Clarify that Atlas orgs are not supported. Included comments from JW. * (DOCSP-12930) Adding information that Atlas orgs are not supported. Also included round 2 of JW's comments: created a new note, reused it, updated info for how to find orgId * (DOCSP-12930) Included third round of JW's comments. Clarify that Atlas orgs are not supported.
diff --git a/source/includes/admonitions/note-k8s-supported-in-om4.rst b/source/includes/admonitions/note-k8s-supported-in-om4.rst
@@ -1,7 +1,8 @@
-.. admonition:: Cloud Manager and |onprem| 4.0.11 Support MongoDB Resources
-   :class: note
+.. important:: 
+   
+   - You can use the |k8s-op-short| to deploy MongoDB resources with
+     |onprem| version 4.0.11 or later and Cloud Manager. 
+     
+   - You can't use the |k8s-op-short| to deploy MongoDB resources to
+     |service|.
 
-   You can use the |k8s-op-short| to deploy MongoDB resources with
-   |onprem| version 4.0.11 or later and Cloud Manager. At any place in
-   this guide that says *Ops Manager*, you can substitute
-   *Cloud Manager*.
diff --git a/source/includes/admonitions/note-substitute-opsm-with-cloudm.rst b/source/includes/admonitions/note-substitute-opsm-with-cloudm.rst
@@ -0,0 +1,3 @@
+.. note::
+    
+  At any place on this page that says *Ops Manager*, you can substitute *Cloud Manager*.
diff --git a/source/includes/list-tables/configmap-keys-curl.rst b/source/includes/list-tables/configmap-keys-curl.rst
@@ -45,21 +45,27 @@
 
        The |k8s-op-short| creates the |mms| project if it does
        not exist. If you omit the ``projectName``, the |k8s-op-short|
-       creates a project with the same name as your |k8s| resource.
+       creates a project with the same name as your
+       |k8s| resource.
 
-       If you need or want to use an existing project, you can find
+       To use an existing project in a |com|
+       organization, locate
        the ``projectName`` by clicking the :guilabel:`All Clusters`
-       link at the top left of the screen, then either search by
-       name in the :guilabel:`Search` box or scroll to find the
-       name in the list. Each card in this list represents the
-       combination of one **Organization** and **Project**.
+       link at the top left of the |com| page, and
+       searching by name in the :guilabel:`Search`
+       box, or scrolling to find the name in the list.
+       Each card in this list represents the
+       combination of one |com| **Organization** and **Project**.
 
      - ``Development``
 
    * - ``orgId``
      - string
-     - 24 character hex string that uniquely identifies your
-       MongoDB :opsmgr:`Organization </tutorial/manage-organizations>`.
+     - 24 character hex string that uniquely
+       identifies your
+       |com| :opsmgr:`Organization </tutorial/manage-organizations>`.
+
+       .. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
 
        Depending on your |k8s-op-short| :ref:`credentials
        <create-k8s-credentials>`, this field is:
@@ -75,47 +81,28 @@
              You must specify an :ref:`existing Organization
              <create-organization>`.
 
-             To find the ``orgId`` of your Organization:
-
-             1. Click the :guilabel:`Context` menu.
-             2. Select your Organization.
-             3. View the current |url| in your browser and copy the   
-                value displayed in the ``<orgId>`` placeholder below:
-
-                | ``https://ops.example.com:8443/``
-                | ``v2#/org/<orgId>/projects``
+             .. include:: /includes/steps/find-org-id.rst
 
           .. tab:: Organization API Keys
              :tabid: org
        
-             If specified, the |k8s-op-short| links to the Organization.
+             If specified, the |k8s-op-short| links to the organization.
              
-             You can find the Organization's ``orgId`` in your |onprem|
-             |url|:
-
-             1. Click the :guilabel:`Context` menu.
-             2. Select your Organization.
-             3. View the current |url| in your browser and copy the 
-                value displayed in the ``<orgId>`` placeholder below:
+             To find the ``orgID`` of your organization:
 
-                | ``https://ops.example.com:8443/``
-                | ``v2#/org/<orgId>/projects``
+             .. include:: /includes/steps/find-org-id.rst
 
-             If omitted, |onprem| creates an Organization called
+             If omitted, |onprem| creates an organization called
              ``projectName`` that contains a project also called
              ``projectName``.
-             
+
              You must have the :authrole:`Organization Project Creator`
              role to create a new project within an existing
-             organization.
-
-       .. admonition:: Limited to |com| Organizations
-          :class: important
+             |com| organization.
+              
+     - ``5cc9b333dde384a625a6615``
+       
 
-          This value must be a |com|
-          organization. The |k8s-op-short| might not work as
-          expected when set to an |service| organization.
 
-     - | ``5cc9b333dd3e384a625a6615``
 
 
diff --git a/source/includes/list-tables/configmap-keys.rst b/source/includes/list-tables/configmap-keys.rst
@@ -74,12 +74,8 @@
           role to create a new project
           *within an existing organization*.
 
-          .. admonition:: Limited to |com| Organizations
+          .. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
 
-             If you set this value, it can be for a |com|
-             organization only. If you try to use an Atlas
-             organization, the |k8s-op-short| may not work as
-             intended.
 
      - | ``5cc9b333dd3e384a625a6615``
 
diff --git a/source/includes/steps-deploy-k8s-standalone.yaml b/source/includes/steps-deploy-k8s-standalone.yaml
@@ -80,8 +80,6 @@ content: |
 
           .. include:: /includes/admonitions/note-namespace-match-configmap.rst
 
-          .. include:: /includes/admonitions/fact-k8s-operator-manages-configmap.rst
-
         - ``<myproject>``
 
       * - :setting:`spec.credentials`
diff --git a/source/includes/steps-find-org-id.yaml b/source/includes/steps-find-org-id.yaml
@@ -0,0 +1,32 @@
+---
+title: "Find the organization's ID."
+ref: find-org-id
+stepnum: 1
+level: 4
+content: |
+
+  Do one of the following:
+
+  a. If you are using |mms| 4.4 or later or
+     |cloud-short|, click
+     :guilabel:`Settings` in the left navigation bar.
+
+  b. If you are using |mms| 4.2 or earlier, click the
+     :guilabel:`Context` menu. 
+     
+---
+
+title: "Copy and paste the orgId into the URL."
+ref: paste-id-in-url
+stepnum: 2
+level: 4
+content: |
+
+  Select your organization, view the current |url|
+  in your browser and copy the value displayed in
+  the ``<orgId>`` placeholder as follows:
+
+  ``https://ops.example.com:8443/``
+  ``v2#/org/<orgId>/projects``
+
+...
diff --git a/source/reference/k8s-op-exclusive-settings.txt b/source/reference/k8s-op-exclusive-settings.txt
@@ -12,7 +12,7 @@ MongoDB |k8s-op-short| Exclusive Settings
    :depth: 2
    :class: singlecols
 
-.. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
+.. include:: /includes/admonitions/note-substitute-opsm-with-cloudm.rst
 
 Kubernetes Operator Overrides Some Ops Manager Settings
 -------------------------------------------------------
diff --git a/source/reference/k8s-operator-specification.txt b/source/reference/k8s-operator-specification.txt
@@ -14,7 +14,7 @@ MongoDB Database Resource Specification
    :depth: 2
    :class: singlecols
 
-.. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
+.. include:: /includes/admonitions/note-substitute-opsm-with-cloudm.rst
 
 The :gh:`MongoDB Enterprise Kubernetes Operator </mongodb/mongodb-enterprise-kubernetes>`
 creates |k8s| |k8s-statefulsets| from specification files that you
diff --git a/source/tutorial/create-project-using-configmap.txt b/source/tutorial/create-project-using-configmap.txt
@@ -23,9 +23,10 @@ the ConfigMap.
 Considerations
 --------------
 
-Starting in |k8s-op-full| version 1.3.0, you can only have one MongoDB
-resource per project. To learn how to deploy a MongoDB resource
-in your project, see :ref:`k8s-deploy-mdb-resources`.
+Starting in |k8s-op-full| version 1.3.0, you can only deploy one
+MongoDB resource per project. See :ref:`k8s-deploy-mdb-resources`.
+
+.. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
 
 Prerequisites
 -------------
diff --git a/source/tutorial/deploy-replica-set.txt b/source/tutorial/deploy-replica-set.txt
@@ -14,6 +14,8 @@ Deploy a Replica Set
    :depth: 1
    :class: singlecol
 
+.. include:: /includes/admonitions/note-substitute-opsm-with-cloudm.rst
+
 .. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
 
 A :term:`replica set` is a group of MongoDB deployments that maintain
diff --git a/source/tutorial/deploy-sharded-cluster.txt b/source/tutorial/deploy-sharded-cluster.txt
@@ -14,6 +14,8 @@ Deploy a Sharded Cluster
 
 .. include:: /includes/styles/corrections.rst
 
+.. include:: /includes/admonitions/note-substitute-opsm-with-cloudm.rst
+
 .. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
 
 :term:`Sharded clusters <sharded cluster>` provide horizontal scaling
diff --git a/source/tutorial/deploy-standalone.txt b/source/tutorial/deploy-standalone.txt
@@ -14,6 +14,8 @@ Deploy a Standalone MongoDB Instance
 
 .. include:: /includes/styles/corrections.rst
 
+.. include:: /includes/admonitions/note-substitute-opsm-with-cloudm.rst
+
 .. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
 
 You can deploy a :term:`standalone` MongoDB instance for |mms| to

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.. note::`
	`2`	`+`
	`3`	`+ At any place on this page that says Ops Manager, you can substitute Cloud Manager.`