Merge pull request #2255 from abutcher/hosted-knobs

Add knobs for disabling router/registry management.

inventory/byo/hosts.origin.example

@@ -259,6 +259,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Provide local certificate paths which will be configured as the
 # router's default certificate.
 #openshift_hosted_router_certificate={"certfile": "/path/to/router.crt", "keyfile": "/path/to/router.key", "cafile": "/path/to/router-ca.crt"}
+#
+# Disable management of the OpenShift Router
+#openshift_hosted_manage_router=false
 
 # Openshift Registry Options
 #
@@ -280,6 +283,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Unless specified, openshift-ansible will calculate the replica count
 # based on the number of nodes matching the openshift registry selector.
 #openshift_hosted_registry_replicas=2
+#
+# Disable management of the OpenShift Registry
+#openshift_hosted_manage_registry=false
 
 # Registry Storage Options
 #

inventory/byo/hosts.ose.example

@@ -253,6 +253,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Provide local certificate paths which will be configured as the
 # router's default certificate.
 #openshift_hosted_router_certificate={"certfile": "/path/to/router.crt", "keyfile": "/path/to/router.key", "cafile": "/path/to/router-ca.crt"}
+#
+# Disable management of the OpenShift Router
+#openshift_hosted_manage_router=false
 
 # Openshift Registry Options
 #
@@ -274,6 +277,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Unless specified, openshift-ansible will calculate the replica count
 # based on the number of nodes matching the openshift registry selector.
 #openshift_hosted_registry_replicas=2
+#
+# Disable management of the OpenShift Registry
+#openshift_hosted_manage_registry=false
 
 # Registry Storage Options
 #

roles/openshift_hosted/tasks/main.yml

@@ -13,7 +13,10 @@
   changed_when: False
 
 - include: router/router.yml
+  when: openshift_hosted_manage_router | default(true) | bool
+
 - include: registry/registry.yml
+  when: openshift_hosted_manage_registry | default(true) | bool
 
 - name: Delete temp directory
   file: