From b1c28e95b0b661de3e9a227661bc771604c3f28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Trellu?= <gaetan.trellu@incloudus.com>
Date: Wed, 19 Jun 2019 16:16:19 -0400
Subject: [PATCH] Fix Qinling deployment and reconfigure
The "environment" variable set in config.yml and handlers/main.yml
has been removed to fix de deployment and the reconfigure.
Change-Id: I912cadb5113d5572235731863825588b2eb12759
---
ansible/roles/qinling/defaults/main.yml | 1 -
ansible/roles/qinling/handlers/main.yml | 2 --
ansible/roles/qinling/tasks/config.yml | 1 -
3 files changed, 4 deletions(-)
diff --git a/ansible/roles/qinling/defaults/main.yml b/ansible/roles/qinling/defaults/main.yml
index 13db9a3bfb..e98c299379 100644
--- a/ansible/roles/qinling/defaults/main.yml
+++ b/ansible/roles/qinling/defaults/main.yml
@@ -29,7 +29,6 @@ qinling_services:
group: qinling-engine
enabled: true
image: "{{ qinling_engine_image_full }}"
- environment: "{{ container_proxy }}"
volumes:
- "{{ node_config_directory }}/qinling-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
diff --git a/ansible/roles/qinling/handlers/main.yml b/ansible/roles/qinling/handlers/main.yml
index 3963f068d5..cf29b6ae00 100644
--- a/ansible/roles/qinling/handlers/main.yml
+++ b/ansible/roles/qinling/handlers/main.yml
@@ -14,7 +14,6 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
- environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
@@ -40,7 +39,6 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
- environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
diff --git a/ansible/roles/qinling/tasks/config.yml b/ansible/roles/qinling/tasks/config.yml
index 67c87cde01..207434c668 100644
--- a/ansible/roles/qinling/tasks/config.yml
+++ b/ansible/roles/qinling/tasks/config.yml
@@ -93,7 +93,6 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
- environment: "{{ item.value.environment }}"
register: check_qinling_containers
when:
- kolla_action != "config"