Remove unecessary blank lines
TrivialFix Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
This commit is contained in:
parent
420f8740ea
commit
2c34214388
@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: Cinder sanity checks
|
- name: Cinder sanity checks
|
||||||
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
|
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
|
||||||
-m kolla_sanity
|
-m kolla_sanity
|
||||||
|
@ -91,4 +91,3 @@ rbd_user = cinder
|
|||||||
rbd_secret_uuid = {{ rbd_secret_uuid }}
|
rbd_secret_uuid = {{ rbd_secret_uuid }}
|
||||||
report_discard_supported = True
|
report_discard_supported = True
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: Glance sanity checks
|
- name: Glance sanity checks
|
||||||
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
|
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
|
||||||
-m kolla_sanity
|
-m kolla_sanity
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: Keystone sanity checks
|
- name: Keystone sanity checks
|
||||||
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
|
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
|
||||||
-m kolla_sanity
|
-m kolla_sanity
|
||||||
@ -17,4 +16,4 @@
|
|||||||
retries: 10
|
retries: 10
|
||||||
delay: 5
|
delay: 5
|
||||||
run_once: True
|
run_once: True
|
||||||
when: kolla_enable_sanity_keystone | bool
|
when: kolla_enable_sanity_keystone | bool
|
||||||
|
@ -12,4 +12,3 @@ mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
|
|||||||
####################
|
####################
|
||||||
# Mongodb
|
# Mongodb
|
||||||
####################
|
####################
|
||||||
|
|
||||||
|
@ -20,4 +20,3 @@
|
|||||||
dest: "{{ node_config_directory }}/mongodb/{{ item }}"
|
dest: "{{ node_config_directory }}/mongodb/{{ item }}"
|
||||||
with_items:
|
with_items:
|
||||||
- "mongodb.conf"
|
- "mongodb.conf"
|
||||||
|
|
||||||
|
@ -76,4 +76,3 @@
|
|||||||
when:
|
when:
|
||||||
- inventory_hostname in groups['nova-spicehtml5proxy']
|
- inventory_hostname in groups['nova-spicehtml5proxy']
|
||||||
- nova_console == 'spice'
|
- nova_console == 'spice'
|
||||||
|
|
||||||
|
@ -9,4 +9,3 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ MAINTAINER {{ maintainer }}
|
|||||||
|
|
||||||
LABEL kolla_version="{{ kolla_version }}"
|
LABEL kolla_version="{{ kolla_version }}"
|
||||||
|
|
||||||
|
|
||||||
{{ include_header }}
|
{{ include_header }}
|
||||||
|
|
||||||
ENV KOLLA_BASE_DISTRO {{ base_distro }}
|
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 \
|
&& rm -rf /usr/lib/python2.7/site-packages \
|
||||||
&& ln -s dist-packages /usr/lib/python2.7/site-packages
|
&& ln -s dist-packages /usr/lib/python2.7/site-packages
|
||||||
|
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
COPY set_configs.py /usr/local/bin/kolla_set_configs
|
COPY set_configs.py /usr/local/bin/kolla_set_configs
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#### Custom data added by Kolla
|
#### Custom data added by Kolla
|
||||||
_KBOLD="\[$(tput bold)\]"
|
_KBOLD="\[$(tput bold)\]"
|
||||||
_KRESET="\[$(tput sgr0)\]"
|
_KRESET="\[$(tput sgr0)\]"
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
||||||
MAINTAINER {{ maintainer }}
|
MAINTAINER {{ maintainer }}
|
||||||
|
|
||||||
|
|
||||||
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
||||||
|
|
||||||
ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
|
ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
|
||||||
|
@ -11,4 +11,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
|||||||
done
|
done
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ RUN yum -y install \
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
|
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
|
||||||
RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
|
RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ cd "$(dirname "$REAL_PATH")/.."
|
|||||||
|
|
||||||
find . -path ./.tox -prune -name '*.json' -print0 |
|
find . -path ./.tox -prune -name '*.json' -print0 |
|
||||||
xargs -0 python tools/validate-json.py || exit 1
|
xargs -0 python tools/validate-json.py || exit 1
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ cd "$(dirname "$REAL_PATH")/.."
|
|||||||
|
|
||||||
find . -name '*.yaml' -o -name '*.yml' -print0 |
|
find . -name '*.yaml' -o -name '*.yml' -print0 |
|
||||||
xargs -0 python tools/validate-yaml.py || exit 1
|
xargs -0 python tools/validate-yaml.py || exit 1
|
||||||
|
|
||||||
|
@ -11,4 +11,3 @@ for dockerfile in "$@"; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
exit $RES
|
exit $RES
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user