Merge "normalize newlines at end of file"

LICENSE

@@ -173,4 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-

_skeleton_role_/defaults/main.yml.j2

@@ -19,4 +19,3 @@
 
 # All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}"
 tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}_debug: false
-

_skeleton_role_/meta/main.yml.j2

@@ -42,4 +42,3 @@ galaxy_info:
 # List your role dependencies here, one per line. Be sure to remove the '[]' above,
 # if you add dependencies to this list.
 dependencies: []
-

_skeleton_role_/molecule/default/Dockerfile.j2

@@ -35,4 +35,3 @@ RUN easy_install {{ pkg }}
 {% endraw %}
 
 CMD ["sh", "-c", "while true; do sleep 10000; done"]
-

_skeleton_role_/molecule/default/playbook.yml.j2

@@ -19,4 +19,3 @@
   hosts: all
   roles:
     - role: "{{ role_name }}"
-

doc/source/roles/role-backup-and-restore.rst

@@ -125,4 +125,3 @@ Lastly, we execute the actual backup step.
       --become-user root \
       --tags bar_create_recover_image \
       ~/bar_rear_create_restore_images.yaml
-

tripleo_ansible/roles/aide/molecule/default/Dockerfile

@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2

@@ -16,4 +16,3 @@ OVS_EXTRA="-- set Interface {{ mgmt_port_dev }} external-ids:iface-status=active
            -- set Interface {{ mgmt_port_dev }} external-ids:skip_cleanup=true \
            -- set Interface {{ mgmt_port_dev }} mac=\"{{ mgmt_port_mac }}\" \
            -- set Interface {{ mgmt_port_dev }} other-config:hwaddr={{ mgmt_port_mac }}"
-

tripleo_ansible/roles/test_json_error_callback/molecule/default/Dockerfile

@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile

@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile

@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile

@@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
 {% endfor %}
 
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile

@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile

@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/tuned/molecule/default/Dockerfile

@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]

tripleo_ansible/roles/tuned/molecule/isolated/Dockerfile

@@ -33,4 +33,4 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
 RUN easy_install {{ pkg }}
 {% endfor %}
 
-CMD ["sh", "-c", "while true; do sleep 10000; done"]
+CMD ["sh", "-c", "while true; do sleep 10000; done"]