Browse Source

Merge pull request #7296 from wmengRH/coding_style

Automatic merge from submit-queue.

change to better coding style

adding space before }} 
to make coding style consistent.
OpenShift Merge Robot 7 years ago
parent
commit
5769d02ff6

+ 2 - 2
roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2

@@ -13,14 +13,14 @@ Requires={{ openshift_docker_service_name }}.service
 [Service]
 EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-master-api
 Environment=GOTRACEBACK=crash
-ExecStartPre=-/usr/bin/docker rm -f {{ openshift_service_type}}-master-api
+ExecStartPre=-/usr/bin/docker rm -f {{ openshift_service_type }}-master-api
 ExecStart=/usr/bin/docker run --rm --privileged --net=host \
   --name {{ openshift_service_type }}-master-api \
   --env-file=/etc/sysconfig/{{ openshift_service_type }}-master-api \
   -v {{ r_openshift_master_data_dir }}:{{ r_openshift_master_data_dir }} \
   -v /var/log:/var/log -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 -%} \
+  {% 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 %}\
   {{ osm_image }}:${IMAGE_VERSION} start master api \

+ 2 - 2
roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2

@@ -10,14 +10,14 @@ PartOf={{ openshift_docker_service_name }}.service
 [Service]
 EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-master-controllers
 Environment=GOTRACEBACK=crash
-ExecStartPre=-/usr/bin/docker rm -f {{ openshift_service_type}}-master-controllers
+ExecStartPre=-/usr/bin/docker rm -f {{ openshift_service_type }}-master-controllers
 ExecStart=/usr/bin/docker run --rm --privileged --net=host \
   --name {{ openshift_service_type }}-master-controllers \
   --env-file=/etc/sysconfig/{{ openshift_service_type }}-master-controllers \
   -v {{ r_openshift_master_data_dir }}:{{ r_openshift_master_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 -%} \
+  {% 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 %}\
   {{ osm_image }}:${IMAGE_VERSION} start master controllers \

+ 2 - 2
roles/openshift_version/tasks/check_available_rpms.yml

@@ -1,7 +1,7 @@
 ---
-- name: Get available {{ openshift_service_type}} version
+- name: Get available {{ openshift_service_type }} version
   repoquery:
-    name: "{{ openshift_service_type}}{{ '-' ~ openshift_release ~ '*' if openshift_release is defined else '' }}"
+    name: "{{ openshift_service_type }}{{ '-' ~ openshift_release ~ '*' if openshift_release is defined else '' }}"
     ignore_excluders: true
   register: rpm_results