From 475a42767a975eeea6c0641522ef9ea4fe9e1e2e Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Sat, 18 Feb 2017 14:13:30 +0400
Subject: [PATCH] Suppress logging for download image
This generates too much output and during upgrade scenarios
can bring us over the 4mb limit.
---
roles/download/tasks/set_docker_image_facts.yml | 2 ++
tests/templates/inventory-gce.j2 | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/roles/download/tasks/set_docker_image_facts.yml b/roles/download/tasks/set_docker_image_facts.yml
index 6fe4af440..33d6d471e 100644
--- a/roles/download/tasks/set_docker_image_facts.yml
+++ b/roles/download/tasks/set_docker_image_facts.yml
@@ -10,12 +10,14 @@
- name: Register docker images info
raw: >-
{{ docker_bin_dir }}/docker images -q | xargs {{ docker_bin_dir }}/docker inspect -f "{{ '{{' }} .RepoTags {{ '}}' }},{{ '{{' }} .RepoDigests {{ '}}' }}"
+ no_log: true
register: docker_images_raw
failed_when: false
check_mode: no
when: not download_always_pull|bool
- set_fact: docker_images="{{docker_images_raw.stdout|regex_replace('\[|\]|\\n]','')|regex_replace('\s',',')}}"
+ no_log: true
when: not download_always_pull|bool
- set_fact:
diff --git a/tests/templates/inventory-gce.j2 b/tests/templates/inventory-gce.j2
index 8274fae8c..d58f6896c 100644
--- a/tests/templates/inventory-gce.j2
+++ b/tests/templates/inventory-gce.j2
@@ -2,7 +2,7 @@
{% set node2 = gce.instance_data[1].name %}
{{node1}} ansible_ssh_host={{gce.instance_data[0].public_ip}}
{{node2}} ansible_ssh_host={{gce.instance_data[1].public_ip}}
-{% if mode is defined and mode in ["separate", "separate-scale"] %}
+{% if mode is defined and mode in ["ha", "ha-scale", "separate", "separate-scale"] %}
{% set node3 = gce.instance_data[2].name %}
{{node3}} ansible_ssh_host={{gce.instance_data[2].public_ip}}
{% endif %}
--
GitLab