diff --git a/ansible/roles/qinling/defaults/main.yml b/ansible/roles/qinling/defaults/main.yml index 13db9a3bfb1019ab64694c146fab701aee7934d2..e98c299379d0f9882d87cd9e01d23a1f3f262667 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 3963f068d5bed2899f74a9519e621168d947663a..cf29b6ae000f946060228dc0d0727c6bf9519fe0 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 67c87cde019def7947a97a9b36120914c5d8ae74..207434c668cac4c289d63cc6acdaa88b15fb8905 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"