Skip to content
Snippets Groups Projects
Commit a683486a authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Remove unneeded blank lines"

parents ec0a7fbd 18785f41
No related branches found
No related tags found
No related merge requests found
--- ---
- name: Ensure docker service directory exists - name: Ensure docker service directory exists
file: file:
path=/etc/systemd/system/docker.service.d path=/etc/systemd/system/docker.service.d
......
...@@ -27,4 +27,3 @@ ...@@ -27,4 +27,3 @@
- { src: "id_rsa", dest: "id_rsa" } - { src: "id_rsa", dest: "id_rsa" }
- { src: "id_rsa.pub", dest: "id_rsa.pub" } - { src: "id_rsa.pub", dest: "id_rsa.pub" }
- { src: "ssh_config", dest: "ssh_config" } - { src: "ssh_config", dest: "ssh_config" }
...@@ -18,4 +18,3 @@ ...@@ -18,4 +18,3 @@
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
/bifrost/playbooks/deploy-dynamic.yaml -e "ansible_python_interpreter=/var/lib/kolla/venv/bin/python" /bifrost/playbooks/deploy-dynamic.yaml -e "ansible_python_interpreter=/var/lib/kolla/venv/bin/python"
-e @/etc/bifrost/bifrost.yml' -e @/etc/bifrost/bifrost.yml'
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
- include: config.yml - include: config.yml
- include: start.yml - include: start.yml
- include: bootstrap.yml - include: bootstrap.yml
...@@ -10,4 +10,3 @@ ...@@ -10,4 +10,3 @@
- "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro" - "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev:/dev" - "/dev:/dev"
...@@ -596,4 +596,3 @@ listen mariadb ...@@ -596,4 +596,3 @@ listen mariadb
{% endfor %} {% endfor %}
{% endif %} {% endif %}
...@@ -13,5 +13,4 @@ mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}" ...@@ -13,5 +13,4 @@ mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
#################### ####################
# Mongodb # Mongodb
#################### ####################
mongodb_replication_set_name: "rs0" mongodb_replication_set_name: "rs0"
...@@ -182,7 +182,6 @@ rbd_secret_uuid = {{ rbd_secret_uuid }} ...@@ -182,7 +182,6 @@ rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif %} {% endif %}
[upgrade_levels] [upgrade_levels]
compute = auto compute = auto
......
...@@ -6,4 +6,3 @@ fi ...@@ -6,4 +6,3 @@ fi
if [[ $(stat -c %a /var/log/kolla/grafana) != "755" ]]; then if [[ $(stat -c %a /var/log/kolla/grafana) != "755" ]]; then
chmod 755 /var/log/kolla/grafana chmod 755 /var/log/kolla/grafana
fi fi
%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R grafana\: /var/lib/grafana/, /bin/chown -R grafana\: /var/lib/grafana/ %kolla ALL=(root) NOPASSWD: /usr/bin/chown -R grafana\: /var/lib/grafana/, /bin/chown -R grafana\: /var/lib/grafana/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment