Skip to content
Snippets Groups Projects
Commit b1c28e95 authored by Gaëtan Trellu's avatar Gaëtan Trellu
Browse files

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
parent 8ce545e7
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,6 @@ qinling_services: ...@@ -29,7 +29,6 @@ qinling_services:
group: qinling-engine group: qinling-engine
enabled: true enabled: true
image: "{{ qinling_engine_image_full }}" image: "{{ qinling_engine_image_full }}"
environment: "{{ container_proxy }}"
volumes: volumes:
- "{{ node_config_directory }}/qinling-engine/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/qinling-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}"
environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
...@@ -40,7 +39,6 @@ ...@@ -40,7 +39,6 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}"
environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
......
...@@ -93,7 +93,6 @@ ...@@ -93,7 +93,6 @@
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}" dimensions: "{{ item.value.dimensions }}"
environment: "{{ item.value.environment }}"
register: check_qinling_containers register: check_qinling_containers
when: when:
- kolla_action != "config" - kolla_action != "config"
......
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