Browse Source

Remove unecessary blank lines

TrivialFix

Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
changes/99/311199/2
Mauricio Lima 6 years ago
parent
commit
2c34214388
  1. 1
      ansible/roles/cinder/tasks/check.yml
  2. 1
      ansible/roles/cinder/templates/cinder.conf.j2
  3. 1
      ansible/roles/glance/tasks/check.yml
  4. 3
      ansible/roles/keystone/tasks/check.yml
  5. 1
      ansible/roles/mongodb/defaults/main.yml
  6. 1
      ansible/roles/mongodb/tasks/config.yml
  7. 1
      ansible/roles/nova/tasks/pull.yml
  8. 1
      ansible/roles/nova/templates/nova-compute-ironic.json.j2
  9. 2
      docker/base/Dockerfile.j2
  10. 1
      docker/base/kolla_bashrc
  11. 1
      docker/elasticsearch/Dockerfile.j2
  12. 1
      docker/ironic/ironic-pxe/extend_start.sh
  13. 1
      docker/mistral/mistral-api/Dockerfile.j2
  14. 1
      tools/validate-all-json.sh
  15. 1
      tools/validate-all-yaml.sh
  16. 1
      tools/validate-maintainer.sh

1
ansible/roles/cinder/tasks/check.yml

@ -1,5 +1,4 @@
---
- name: Cinder sanity checks
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_sanity

1
ansible/roles/cinder/templates/cinder.conf.j2

@ -91,4 +91,3 @@ rbd_user = cinder
rbd_secret_uuid = {{ rbd_secret_uuid }}
report_discard_supported = True
{% endif %}

1
ansible/roles/glance/tasks/check.yml

@ -1,5 +1,4 @@
---
- name: Glance sanity checks
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_sanity

3
ansible/roles/keystone/tasks/check.yml

@ -1,5 +1,4 @@
---
- name: Keystone sanity checks
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_sanity
@ -17,4 +16,4 @@
retries: 10
delay: 5
run_once: True
when: kolla_enable_sanity_keystone | bool
when: kolla_enable_sanity_keystone | bool

1
ansible/roles/mongodb/defaults/main.yml

@ -12,4 +12,3 @@ mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
####################
# Mongodb
####################

1
ansible/roles/mongodb/tasks/config.yml

@ -20,4 +20,3 @@
dest: "{{ node_config_directory }}/mongodb/{{ item }}"
with_items:
- "mongodb.conf"

1
ansible/roles/nova/tasks/pull.yml

@ -76,4 +76,3 @@
when:
- inventory_hostname in groups['nova-spicehtml5proxy']
- nova_console == 'spice'

1
ansible/roles/nova/templates/nova-compute-ironic.json.j2

@ -9,4 +9,3 @@
}
]
}

2
docker/base/Dockerfile.j2

@ -3,7 +3,6 @@ MAINTAINER {{ maintainer }}
LABEL kolla_version="{{ kolla_version }}"
{{ include_header }}
ENV KOLLA_BASE_DISTRO {{ base_distro }}
@ -219,7 +218,6 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 199369E540
&& rm -rf /usr/lib/python2.7/site-packages \
&& ln -s dist-packages /usr/lib/python2.7/site-packages
{% endif %}
COPY set_configs.py /usr/local/bin/kolla_set_configs

1
docker/base/kolla_bashrc

@ -1,4 +1,3 @@
#### Custom data added by Kolla
_KBOLD="\[$(tput bold)\]"
_KRESET="\[$(tput sgr0)\]"

1
docker/elasticsearch/Dockerfile.j2

@ -1,7 +1,6 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/

1
docker/ironic/ironic-pxe/extend_start.sh

@ -11,4 +11,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
done
exit 0
fi

1
docker/mistral/mistral-api/Dockerfile.j2

@ -11,7 +11,6 @@ RUN yum -y install \
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start

1
tools/validate-all-json.sh

@ -5,4 +5,3 @@ cd "$(dirname "$REAL_PATH")/.."
find . -path ./.tox -prune -name '*.json' -print0 |
xargs -0 python tools/validate-json.py || exit 1

1
tools/validate-all-yaml.sh

@ -5,4 +5,3 @@ cd "$(dirname "$REAL_PATH")/.."
find . -name '*.yaml' -o -name '*.yml' -print0 |
xargs -0 python tools/validate-yaml.py || exit 1

1
tools/validate-maintainer.sh

@ -11,4 +11,3 @@ for dockerfile in "$@"; do
done
exit $RES

Loading…
Cancel
Save