Merge "Remove unecessary blank lines"

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

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 %}
-

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

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

ansible/roles/mongodb/defaults/main.yml

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

ansible/roles/mongodb/tasks/config.yml

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

ansible/roles/nova/tasks/pull.yml

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

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

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

docker/base/Dockerfile.j2

@@ -3,7 +3,6 @@ MAINTAINER {{ maintainer }}
 
 LABEL kolla_version="{{ kolla_version }}"
 
-
 {{ include_header }}
 
 ENV KOLLA_BASE_DISTRO {{ base_distro }}
@@ -210,7 +209,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

docker/base/kolla_bashrc

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

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/

docker/ironic/ironic-pxe/extend_start.sh

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

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
 

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
-

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
-

tools/validate-maintainer.sh

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