diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-10 22:36:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 22:36:57 -0500 |
| commit | 1e6c2b83a16e692d9abe4210a981ddddec662632 (patch) | |
| tree | 0a599cf9def4c3a3569f5db333f9f45e5ec532a4 | |
| parent | 693769209936849a6f83c4ef85bda39dabfb8800 (diff) | |
| parent | c6e5d479976a306d38446c60d648150ed56c7211 (diff) | |
| download | openshift-1e6c2b83a16e692d9abe4210a981ddddec662632.tar.gz openshift-1e6c2b83a16e692d9abe4210a981ddddec662632.tar.bz2 openshift-1e6c2b83a16e692d9abe4210a981ddddec662632.tar.xz openshift-1e6c2b83a16e692d9abe4210a981ddddec662632.zip | |
Merge pull request #5726 from ewolinetz/update_tsb_image
Updating tsb image names
| -rw-r--r-- | files/origin-components/apiserver-template.yaml | 6 | ||||
| -rw-r--r-- | roles/template_service_broker/vars/default_images.yml | 2 | ||||
| -rw-r--r-- | roles/template_service_broker/vars/openshift-enterprise.yml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/files/origin-components/apiserver-template.yaml b/files/origin-components/apiserver-template.yaml index 035e4734b..4dd9395d0 100644 --- a/files/origin-components/apiserver-template.yaml +++ b/files/origin-components/apiserver-template.yaml @@ -4,7 +4,7 @@ metadata: name: template-service-broker-apiserver parameters: - name: IMAGE - value: openshift/origin:latest + value: openshift/origin-template-service-broker:latest - name: NAMESPACE value: openshift-template-service-broker - name: LOGLEVEL @@ -40,14 +40,14 @@ objects: image: ${IMAGE} imagePullPolicy: IfNotPresent command: - - "/usr/bin/openshift" + - "/usr/bin/template-service-broker" - "start" - "template-service-broker" - "--secure-port=8443" - "--audit-log-path=-" - "--tls-cert-file=/var/serving-cert/tls.crt" - "--tls-private-key-file=/var/serving-cert/tls.key" - - "--loglevel=${LOGLEVEL}" + - "--v=${LOGLEVEL}" - "--config=/var/apiserver-config/apiserver-config.yaml" ports: - containerPort: 8443 diff --git a/roles/template_service_broker/vars/default_images.yml b/roles/template_service_broker/vars/default_images.yml index 77afe1f43..662d65d9f 100644 --- a/roles/template_service_broker/vars/default_images.yml +++ b/roles/template_service_broker/vars/default_images.yml @@ -1,4 +1,4 @@ --- __template_service_broker_prefix: "docker.io/openshift/" __template_service_broker_version: "latest" -__template_service_broker_image_name: "origin" +__template_service_broker_image_name: "origin-template-service-broker" diff --git a/roles/template_service_broker/vars/openshift-enterprise.yml b/roles/template_service_broker/vars/openshift-enterprise.yml index dfab1e01b..16a08e72f 100644 --- a/roles/template_service_broker/vars/openshift-enterprise.yml +++ b/roles/template_service_broker/vars/openshift-enterprise.yml @@ -1,4 +1,4 @@ --- __template_service_broker_prefix: "registry.access.redhat.com/openshift3/" __template_service_broker_version: "v3.7" -__template_service_broker_image_name: "ose" +__template_service_broker_image_name: "ose-template-service-broker" |