diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-19 07:39:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 07:39:22 -0800 |
| commit | 7ab8e67bfc62e16466e3fd211fded63f16583403 (patch) | |
| tree | 5d4d5ea3182a4ad089267010d0fc267fde5043b4 /roles/openshift_master/templates | |
| parent | f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6 (diff) | |
| parent | 313b15fb2668cbe6738802f913a9caa6203083b2 (diff) | |
| download | openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.gz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.bz2 openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.xz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.zip | |
Merge pull request #6515 from mgugino-upstream-stage/defacting
Automatic merge from submit-queue.
Remove some small items from openshift_facts
Remove some small items from openshift_facts that
don't need to be there.
Diffstat (limited to 'roles/openshift_master/templates')
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 index 5e46d9121..a56c0340c 100644 --- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 +++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 @@ -21,7 +21,7 @@ ExecStart=/usr/bin/docker run --rm --privileged --net=host \ {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} \ -v /etc/pki:/etc/pki:ro \ {% if l_bind_docker_reg_auth | default(False) %} -v {{ oreg_auth_credentials_path }}:/root/.docker:ro{% endif %}\ - {{ openshift.master.master_image }}:${IMAGE_VERSION} start master api \ + {{ osm_image }}:${IMAGE_VERSION} start master api \ --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift_service_type }}-master-api diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 index 899575f1a..79171d511 100644 --- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 @@ -20,7 +20,7 @@ ExecStart=/usr/bin/docker run --rm --privileged --net=host \ {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} \ -v /etc/pki:/etc/pki:ro \ {% if l_bind_docker_reg_auth | default(False) %} -v {{ oreg_auth_credentials_path }}:/root/.docker:ro{% endif %}\ - {{ openshift.master.master_image }}:${IMAGE_VERSION} start master controllers \ + {{ osm_image }}:${IMAGE_VERSION} start master controllers \ --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift_service_type }}-master-controllers |