diff options
author | Andrew Butcher <abutcher@redhat.com> | 2016-08-25 14:42:40 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2016-08-25 14:42:40 -0400 |
commit | 791640e083c31e4380a3d7cd929fd67567a944f8 (patch) | |
tree | d2cf08fbf7a3bca2e5fd35378f40f6758b87f579 /roles/openshift_master/templates/master_docker/master.docker.service.j2 | |
parent | b8e72ea2143834317043f19cbc3dddf8ad9047a5 (diff) | |
download | openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.gz openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.bz2 openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.xz openshift-791640e083c31e4380a3d7cd929fd67567a944f8.zip |
Don't use openshift_env for cloud provider facts.
Diffstat (limited to 'roles/openshift_master/templates/master_docker/master.docker.service.j2')
-rw-r--r-- | roles/openshift_master/templates/master_docker/master.docker.service.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master_docker/master.docker.service.j2 b/roles/openshift_master/templates/master_docker/master.docker.service.j2 index 97f698b68..be7644710 100644 --- a/roles/openshift_master/templates/master_docker/master.docker.service.j2 +++ b/roles/openshift_master/templates/master_docker/master.docker.service.j2 @@ -8,7 +8,7 @@ Wants=etcd_container.service [Service] EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master ExecStartPre=-/usr/bin/docker rm -f {{ openshift.common.service_type }}-master -ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master -v {{ openshift.common.data_dir }}:{{ openshift.common.data_dir }} -v /var/run/docker.sock:/var/run/docker.sock -v {{ openshift.common.config_base }}:{{ openshift.common.config_base }} {% if 'cloudprovider' in openshift and 'kind' in openshift.cloudprovider and openshift.cloudprovider.kind != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} {{ openshift.master.master_image }}:${IMAGE_VERSION} start master --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master -v {{ openshift.common.data_dir }}:{{ openshift.common.data_dir }} -v /var/run/docker.sock:/var/run/docker.sock -v {{ openshift.common.config_base }}:{{ openshift.common.config_base }} {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} {{ openshift.master.master_image }}:${IMAGE_VERSION} start master --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master Restart=always |