Merge pull request #5268 from abutcher/multi-router-example

Update openshift_hosted_routers example to be in ini format.

2 files changed, 4 insertions, 76 deletions

diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 9206d57fc..ad69bd587 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -380,45 +380,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # and is in the form of a list.  If no data is passed then a default router will be
 # created.  There are multiple combinations of router sharding.  The one described
 # below supports routers on separate nodes.
-#openshift_hosted_routers:
-#- name: router1
-#  stats_port: 1936
-#  ports:
-#  - 80:80
-#  - 443:443
-#  replicas: 1
-#  namespace: default
-#  serviceaccount: router
-#  selector: type=router1
-#  images: "openshift3/ose-${component}:${version}"
-#  edits: []
-#  certificate:
-#    certfile: /path/to/certificate/abc.crt
-#    keyfile: /path/to/certificate/abc.key
-#    cafile: /path/to/certificate/ca.crt
-#- name: router2
-#  stats_port: 1936
-#  ports:
-#  - 80:80
-#  - 443:443
-#  replicas: 1
-#  namespace: default
-#  serviceaccount: router
-#  selector: type=router2
-#  images: "openshift3/ose-${component}:${version}"
-#  certificate:
-#    certfile: /path/to/certificate/xyz.crt
-#    keyfile: /path/to/certificate/xyz.key
-#    cafile: /path/to/certificate/ca.crt
-#  edits:
-#  # ROUTE_LABELS sets the router to listen for routes
-#  # tagged with the provided values
-#  - key: spec.template.spec.containers[0].env
-#    value:
-#      name: ROUTE_LABELS
-#      value: "route=external"
-#    action: append
 #
+#openshift_hosted_routers=[{'name': 'router1', 'certificate': {'certfile': '/path/to/certificate/abc.crt', 'keyfile': '/path/to/certificate/abc.key', 'cafile': '/path/to/certificate/ca.crt'}, 'replicas': 1, 'serviceaccount': 'router', 'namespace': 'default', 'stats_port': 1936, 'edits': [], 'images': 'openshift3/ose-${component}:${version}', 'selector': 'type=router1', 'ports': ['80:80', '443:443']}, {'name': 'router2', 'certificate': {'certfile': '/path/to/certificate/xyz.crt', 'keyfile': '/path/to/certificate/xyz.key', 'cafile': '/path/to/certificate/ca.crt'}, 'replicas': 1, 'serviceaccount': 'router', 'namespace': 'default', 'stats_port': 1936, 'edits': [{'action': 'append', 'key': 'spec.template.spec.containers[0].env', 'value': {'name': 'ROUTE_LABELS', 'value': 'route=external'}}], 'images': 'openshift3/ose-${component}:${version}', 'selector': 'type=router2', 'ports': ['80:80', '443:443']}]
+
 # OpenShift Registry Console Options
 # Override the console image prefix for enterprise deployments, not used in origin
 # default is "registry.access.redhat.com/openshift3/" and the image appended is "registry-console"
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index c55eb9b3f..b52806bc7 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -387,44 +387,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # and is in the form of a list.  If no data is passed then a default router will be
 # created.  There are multiple combinations of router sharding.  The one described
 # below supports routers on separate nodes.
-#openshift_hosted_routers:
-#- name: router1
-#  stats_port: 1936
-#  ports:
-#  - 80:80
-#  - 443:443
-#  replicas: 1
-#  namespace: default
-#  serviceaccount: router
-#  selector: type=router1
-#  images: "openshift3/ose-${component}:${version}"
-#  edits: []
-#  certificate:
-#    certfile: /path/to/certificate/abc.crt
-#    keyfile: /path/to/certificate/abc.key
-#    cafile: /path/to/certificate/ca.crt
-#- name: router2
-#  stats_port: 1936
-#  ports:
-#  - 80:80
-#  - 443:443
-#  replicas: 1
-#  namespace: default
-#  serviceaccount: router
-#  selector: type=router2
-#  images: "openshift3/ose-${component}:${version}"
-#  certificate:
-#    certfile: /path/to/certificate/xyz.crt
-#    keyfile: /path/to/certificate/xyz.key
-#    cafile: /path/to/certificate/ca.crt
-#  edits:
-#  # ROUTE_LABELS sets the router to listen for routes
-#  # tagged with the provided values
-#  - key: spec.template.spec.containers[0].env
-#    value:
-#      name: ROUTE_LABELS
-#      value: "route=external"
-#    action: append
+#
+#openshift_hosted_routers=[{'name': 'router1', 'certificate': {'certfile': '/path/to/certificate/abc.crt', 'keyfile': '/path/to/certificate/abc.key', 'cafile': '/path/to/certificate/ca.crt'}, 'replicas': 1, 'serviceaccount': 'router', 'namespace': 'default', 'stats_port': 1936, 'edits': [], 'images': 'openshift3/ose-${component}:${version}', 'selector': 'type=router1', 'ports': ['80:80', '443:443']}, {'name': 'router2', 'certificate': {'certfile': '/path/to/certificate/xyz.crt', 'keyfile': '/path/to/certificate/xyz.key', 'cafile': '/path/to/certificate/ca.crt'}, 'replicas': 1, 'serviceaccount': 'router', 'namespace': 'default', 'stats_port': 1936, 'edits': [{'action': 'append', 'key': 'spec.template.spec.containers[0].env', 'value': {'name': 'ROUTE_LABELS', 'value': 'route=external'}}], 'images': 'openshift3/ose-${component}:${version}', 'selector': 'type=router2', 'ports': ['80:80', '443:443']}]
 
 # OpenShift Registry Console Options
 # Override the console image prefix for enterprise deployments, not used in origin