From 2c342143883894525ef670bf196edb8566eab71c Mon Sep 17 00:00:00 2001
From: Mauricio Lima <mauriciolimab@gmail.com>
Date: Fri, 29 Apr 2016 13:15:15 -0400
Subject: [PATCH] Remove unecessary blank lines

TrivialFix

Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
---
 ansible/roles/cinder/tasks/check.yml                     | 1 -
 ansible/roles/cinder/templates/cinder.conf.j2            | 1 -
 ansible/roles/glance/tasks/check.yml                     | 1 -
 ansible/roles/keystone/tasks/check.yml                   | 3 +--
 ansible/roles/mongodb/defaults/main.yml                  | 1 -
 ansible/roles/mongodb/tasks/config.yml                   | 1 -
 ansible/roles/nova/tasks/pull.yml                        | 1 -
 ansible/roles/nova/templates/nova-compute-ironic.json.j2 | 1 -
 docker/base/Dockerfile.j2                                | 2 --
 docker/base/kolla_bashrc                                 | 1 -
 docker/elasticsearch/Dockerfile.j2                       | 1 -
 docker/ironic/ironic-pxe/extend_start.sh                 | 1 -
 docker/mistral/mistral-api/Dockerfile.j2                 | 1 -
 tools/validate-all-json.sh                               | 1 -
 tools/validate-all-yaml.sh                               | 1 -
 tools/validate-maintainer.sh                             | 1 -
 16 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/ansible/roles/cinder/tasks/check.yml b/ansible/roles/cinder/tasks/check.yml
index 2184471a55..be12310760 100644
--- a/ansible/roles/cinder/tasks/check.yml
+++ b/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
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 313f99ef84..8fff2104cf 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/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 %}
-
diff --git a/ansible/roles/glance/tasks/check.yml b/ansible/roles/glance/tasks/check.yml
index 0ce7bf547b..6dab34da6a 100644
--- a/ansible/roles/glance/tasks/check.yml
+++ b/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
diff --git a/ansible/roles/keystone/tasks/check.yml b/ansible/roles/keystone/tasks/check.yml
index 53842721b9..56d000aebc 100644
--- a/ansible/roles/keystone/tasks/check.yml
+++ b/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
\ No newline at end of file
+  when: kolla_enable_sanity_keystone | bool
diff --git a/ansible/roles/mongodb/defaults/main.yml b/ansible/roles/mongodb/defaults/main.yml
index 168ab153ca..4dfddf874e 100644
--- a/ansible/roles/mongodb/defaults/main.yml
+++ b/ansible/roles/mongodb/defaults/main.yml
@@ -12,4 +12,3 @@ mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
 ####################
 # Mongodb
 ####################
-
diff --git a/ansible/roles/mongodb/tasks/config.yml b/ansible/roles/mongodb/tasks/config.yml
index def44cefd4..9501e38986 100644
--- a/ansible/roles/mongodb/tasks/config.yml
+++ b/ansible/roles/mongodb/tasks/config.yml
@@ -20,4 +20,3 @@
     dest: "{{ node_config_directory }}/mongodb/{{ item }}"
   with_items:
      - "mongodb.conf"
-
diff --git a/ansible/roles/nova/tasks/pull.yml b/ansible/roles/nova/tasks/pull.yml
index b761f0c451..6d067ab7e4 100644
--- a/ansible/roles/nova/tasks/pull.yml
+++ b/ansible/roles/nova/tasks/pull.yml
@@ -76,4 +76,3 @@
   when:
     - inventory_hostname in groups['nova-spicehtml5proxy']
     - nova_console == 'spice'
-
diff --git a/ansible/roles/nova/templates/nova-compute-ironic.json.j2 b/ansible/roles/nova/templates/nova-compute-ironic.json.j2
index c89df44094..35ae7cfe4a 100644
--- a/ansible/roles/nova/templates/nova-compute-ironic.json.j2
+++ b/ansible/roles/nova/templates/nova-compute-ironic.json.j2
@@ -9,4 +9,3 @@
         }
     ]
 }
-
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index ba5759bf65..cd4c160712 100644
--- a/docker/base/Dockerfile.j2
+++ b/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
diff --git a/docker/base/kolla_bashrc b/docker/base/kolla_bashrc
index c797e51a9b..09b19cc063 100644
--- a/docker/base/kolla_bashrc
+++ b/docker/base/kolla_bashrc
@@ -1,4 +1,3 @@
-
 #### Custom data added by Kolla
 _KBOLD="\[$(tput bold)\]"
 _KRESET="\[$(tput sgr0)\]"
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index c433db54b3..afa3027752 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/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/
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh
index ce43ec3785..02ee5480af 100644
--- a/docker/ironic/ironic-pxe/extend_start.sh
+++ b/docker/ironic/ironic-pxe/extend_start.sh
@@ -11,4 +11,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     done
     exit 0
 fi
-
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index b742275705..0e06ec0b9b 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/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
 
diff --git a/tools/validate-all-json.sh b/tools/validate-all-json.sh
index 26d01ed227..7e61a8a1ad 100755
--- a/tools/validate-all-json.sh
+++ b/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
-
diff --git a/tools/validate-all-yaml.sh b/tools/validate-all-yaml.sh
index bc9742b2e5..960de9a58a 100755
--- a/tools/validate-all-yaml.sh
+++ b/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
-
diff --git a/tools/validate-maintainer.sh b/tools/validate-maintainer.sh
index dca8506fae..455abed10f 100755
--- a/tools/validate-maintainer.sh
+++ b/tools/validate-maintainer.sh
@@ -11,4 +11,3 @@ for dockerfile in "$@"; do
 done
 
 exit $RES
-