summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-22 11:46:12 -0400
committerGitHub <noreply@github.com>2016-09-22 11:46:12 -0400
commit0d5f1e214a98869e74599aa02ff5739ee6f7f002 (patch)
tree60b17448136bc45b63986a7a8d3aa55059d24e2f
parent5604276edfaed5ea26c1417a72d313d73db371df (diff)
parent05cc4d84fba2a0ac6877ec7d2929a4d461b1124e (diff)
downloadopenshift-0d5f1e214a98869e74599aa02ff5739ee6f7f002.tar.gz
openshift-0d5f1e214a98869e74599aa02ff5739ee6f7f002.tar.bz2
openshift-0d5f1e214a98869e74599aa02ff5739ee6f7f002.tar.xz
openshift-0d5f1e214a98869e74599aa02ff5739ee6f7f002.zip
Merge pull request #2489 from andrewklau/routername
Add openshift_hosted_router_name
-rw-r--r--roles/openshift_hosted/README.md1
-rw-r--r--roles/openshift_hosted/tasks/router/router.yml4
2 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_hosted/README.md b/roles/openshift_hosted/README.md
index 102728820..328f800bf 100644
--- a/roles/openshift_hosted/README.md
+++ b/roles/openshift_hosted/README.md
@@ -22,6 +22,7 @@ From this role:
| openshift_hosted_router_registryurl | 'openshift3/ose-${component}:${version}' | The image to base the OpenShift router on. |
| openshift_hosted_router_replicas | Number of nodes matching selector | The number of replicas to configure. |
| openshift_hosted_router_selector | region=infra | Node selector used when creating router. The OpenShift router will only be deployed to nodes matching this selector. |
+| openshift_hosted_router_name | router | The name of the router to be created. |
| openshift_hosted_registry_registryurl | 'openshift3/ose-${component}:${version}' | The image to base the OpenShift registry on. |
| openshift_hosted_registry_replicas | Number of nodes matching selector | The number of replicas to configure. |
| openshift_hosted_registry_selector | region=infra | Node selector used when creating registry. The OpenShift registry will only be deployed to nodes matching this selector. |
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml
index e18b9781c..0cad19c34 100644
--- a/roles/openshift_hosted/tasks/router/router.yml
+++ b/roles/openshift_hosted/tasks/router/router.yml
@@ -70,6 +70,10 @@
{% if openshift.hosted.router.registryurl | default(none) is not none -%}
--images='{{ openshift.hosted.router.registryurl }}'
{% endif -%}
+ {% if openshift.hosted.router.name | default(none) is not none -%}
+ {{ openshift.hosted.router.name }}
+ {% endif -%}
+
register: openshift_hosted_router_results
changed_when: "'service exists' not in openshift_hosted_router_results.stdout"
failed_when: "openshift_hosted_router_results.rc != 0 and 'service exists' not in openshift_hosted_router_results.stdout and 'deployment_config' not in openshift_hosted_router_results.stderr and 'service' not in openshift_hosted_router_results.stderr"