From 35583f57c71db5b181d0eaefc0bfc620c3790535 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 17 Feb 2017 15:11:51 -0500
Subject: Renamed modules, fixed docs, renamed variables, and cleaned up logic.

---
 roles/lib_openshift/src/doc/registry |  3 +--
 roles/lib_openshift/src/doc/router   | 36 +++++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'roles/lib_openshift/src/doc')

diff --git a/roles/lib_openshift/src/doc/registry b/roles/lib_openshift/src/doc/registry
index 5ae969c73..232d30513 100644
--- a/roles/lib_openshift/src/doc/registry
+++ b/roles/lib_openshift/src/doc/registry
@@ -116,7 +116,7 @@ options:
     description:
     - Use a daemonset instead of a deployment config.
     required: false
-    default: None
+    default: False
     aliases: []
   edits:
     description:
@@ -144,7 +144,6 @@ extends_documentation_fragment: []
 EXAMPLES = '''
 - name: create a secure registry
   oadm_registry:
-    credentials: /etc/origin/master/openshift-registry.kubeconfig
     name: docker-registry
     service_account: registry
     replicas: 2
diff --git a/roles/lib_openshift/src/doc/router b/roles/lib_openshift/src/doc/router
index 3938d8415..6ff7e3f8d 100644
--- a/roles/lib_openshift/src/doc/router
+++ b/roles/lib_openshift/src/doc/router
@@ -43,12 +43,6 @@ options:
     required: false
     default: default
     aliases: []
-  credentials:
-    description:
-    - Path to a .kubeconfig file that will contain the credentials the registry should use to contact the master.
-    required: false
-    default: None
-    aliases: []
   images:
     description:
     - The image to base this router on - ${component} will be replaced with --type
@@ -159,7 +153,31 @@ options:
     aliases: []
 author:
 - "Kenny Woodson <kwoodson@redhat.com>"
-extends_documentation_fragment: []
+extends_documentation_fragment:
+- There are some exceptions to note when doing the idempotency in this module.
+- The strategy is to use the oc adm router command to generate a default
+- configuration when creating or updating a router.  Often times there
+- differences from the generated template and what is in memory in openshift.
+- We make exceptions to not check these specific values when comparing objects.
+- Here are a list of exceptions:
+- - DeploymentConfig:
+    - dnsPolicy
+    - terminationGracePeriodSeconds
+    - restartPolicy
+    - timeoutSeconds
+    - livenessProbe
+    - readinessProbe
+    - terminationMessagePath
+    - hostPort
+    - defaultMode
+  - Service:
+    - portalIP
+    - clusterIP
+    - sessionAffinity
+    - type
+  - ServiceAccount:
+    - secrets
+    - imagePullSecrets
 '''
 
 EXAMPLES = '''
@@ -184,10 +202,10 @@ EXAMPLES = '''
       action: put
     - key: spec.template.spec.containers[0].resources.limits.memory
       value: 2G
-      action: update
+      action: put
     - key: spec.template.spec.containers[0].resources.requests.memory
       value: 1G
-      action: update
+      action: put
     - key: spec.template.spec.containers[0].env
       value:
         name: EXTENDED_VALIDATION
-- 
cgit v1.2.3