diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-28 16:32:38 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 09:05:42 -0500 |
| commit | 7d561bd252a4ddc9e204f31144fbed7fecd99bff (patch) | |
| tree | 372252fd59dfa4e1f576e54977375621858281d0 /roles/openshift_master/templates/native-cluster | |
| parent | 6b25d27ca4ad9458688902d0c3e7c3a9c7b9c15d (diff) | |
| download | openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.gz openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.bz2 openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.tar.xz openshift-7d561bd252a4ddc9e204f31144fbed7fecd99bff.zip | |
Correctly set the image tag for containerized installs (and upgrades)
Diffstat (limited to 'roles/openshift_master/templates/native-cluster')
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 index 48bfa5f04..cfa3b3bfc 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 @@ -1,5 +1,8 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} --master={{ openshift.master.loopback_api_url }} CONFIG_FILE={{ openshift_master_config_file }} +{% if openshift.common.is_containerized %} +IMAGE_VERSION={{ openshift.common.image_tag }} +{% endif %} # Proxy configuration # Origin uses standard HTTP_PROXY environment variables. Be sure to set diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 index cdc56eece..0b86f5f6b 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 @@ -1,5 +1,8 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.controllers_port }} CONFIG_FILE={{ openshift_master_config_file }} +{% if openshift.common.is_containerized %} +IMAGE_VERSION={{ openshift.common.image_tag }} +{% endif %} # Proxy configuration # Origin uses standard HTTP_PROXY environment variables. Be sure to set |