diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 11:04:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 11:04:18 -0700 |
| commit | fd939a1da0f487def7a8107b464d4444f12bf8ad (patch) | |
| tree | 5795f35b2ea5b741ad5f3e1d2a73c9d77eee6cf7 | |
| parent | 168dcd3e059872b6be505ffd7ffa231a9777b985 (diff) | |
| parent | fc01d4f5fb3d7b53168486bc3ac3c2c47879574d (diff) | |
| download | openshift-fd939a1da0f487def7a8107b464d4444f12bf8ad.tar.gz openshift-fd939a1da0f487def7a8107b464d4444f12bf8ad.tar.bz2 openshift-fd939a1da0f487def7a8107b464d4444f12bf8ad.tar.xz openshift-fd939a1da0f487def7a8107b464d4444f12bf8ad.zip | |
Merge pull request #5526 from ewolinetz/tsb_pass_image
Automatic merge from submit-queue
Passing in image parameter for tsb template
CC @jim-minter @deads2k @bparees
| -rw-r--r-- | roles/template_service_broker/tasks/install.yml | 6 | ||||
| -rw-r--r-- | roles/template_service_broker/vars/default_images.yml | 4 | ||||
| -rw-r--r-- | roles/template_service_broker/vars/openshift-enterprise.yml | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml index 199df83c2..a9d22aa06 100644 --- a/roles/template_service_broker/tasks/install.yml +++ b/roles/template_service_broker/tasks/install.yml @@ -8,7 +8,9 @@ - name: set ansible_service_broker facts set_fact: - template_service_broker_image: "{{ template_service_broker_image | default(__template_service_broker_image) }}" + template_service_broker_prefix: "{{ template_service_broker_prefix | default(__template_service_broker_prefix) }}" + template_service_broker_version: "{{ template_service_broker_version | default(__template_service_broker_version) }}" + template_service_broker_image_name: "{{ template_service_broker_image_name | default(__template_service_broker_image_name) }}" - oc_project: name: openshift-template-service-broker @@ -28,7 +30,7 @@ - name: Apply template file shell: > - oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}" --param API_SERVER_CONFIG="{{ lookup('file', __tsb_files_location ~ '/' ~ __tsb_config_file) }}" | kubectl apply -f - + oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}" --param API_SERVER_CONFIG="{{ lookup('file', __tsb_files_location ~ '/' ~ __tsb_config_file) }}" --param IMAGE="{{ template_service_broker_prefix }}{{ template_service_broker_image_name }}:{{ template_service_broker_version }}" | kubectl apply -f - # reconcile with rbac - name: Reconcile with RBAC file diff --git a/roles/template_service_broker/vars/default_images.yml b/roles/template_service_broker/vars/default_images.yml index 807f2822c..77afe1f43 100644 --- a/roles/template_service_broker/vars/default_images.yml +++ b/roles/template_service_broker/vars/default_images.yml @@ -1,2 +1,4 @@ --- -__template_service_broker_image: "" +__template_service_broker_prefix: "docker.io/openshift/" +__template_service_broker_version: "latest" +__template_service_broker_image_name: "origin" diff --git a/roles/template_service_broker/vars/openshift-enterprise.yml b/roles/template_service_broker/vars/openshift-enterprise.yml index 807f2822c..dfab1e01b 100644 --- a/roles/template_service_broker/vars/openshift-enterprise.yml +++ b/roles/template_service_broker/vars/openshift-enterprise.yml @@ -1,2 +1,4 @@ --- -__template_service_broker_image: "" +__template_service_broker_prefix: "registry.access.redhat.com/openshift3/" +__template_service_broker_version: "v3.7" +__template_service_broker_image_name: "ose" |