openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow setting container_proxy per service"

Browse Source
This commit is contained in:
Zuul 2020-09-24 10:05:50 +00:00 committed by Gerrit Code Review
commit 43a0a1ca3d
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/bifrost/defaults/main.yml
View File

@ -10,3 +10,5 @@ bifrost_tag: "{{ openstack_tag }}"
bifrost_deploy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ bifrost_install_type }}-bifrost-deploy" bifrost_deploy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ bifrost_install_type }}-bifrost-deploy"
bifrost_deploy_tag: "{{ bifrost_tag }}" bifrost_deploy_tag: "{{ bifrost_tag }}"
bifrost_deploy_image_full: "{{ bifrost_deploy_image }}:{{ bifrost_deploy_tag }}" bifrost_deploy_image_full: "{{ bifrost_deploy_image }}:{{ bifrost_deploy_tag }}"
bifrost_deploy_container_proxy: "{{ container_proxy }}"

2
ansible/roles/bifrost/tasks/start.yml
View File

@ -7,7 +7,7 @@
image: "{{ bifrost_deploy_image_full }}" image: "{{ bifrost_deploy_image_full }}"
name: "bifrost_deploy" name: "bifrost_deploy"
privileged: True privileged: True
environment: "{{ container_proxy }}" environment: "{{ bifrost_deploy_container_proxy }}"
volumes: volumes:
- "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro" - "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"

4
ansible/roles/glance/defaults/main.yml
View File

@ -8,7 +8,7 @@ glance_services:
host_in_groups: "{{ inventory_hostname in glance_api_hosts }}" host_in_groups: "{{ inventory_hostname in glance_api_hosts }}"
enabled: true enabled: true
image: "{{ glance_api_image_full }}" image: "{{ glance_api_image_full }}"
environment: "{{ container_proxy }}" environment: "{{ glance_api_container_proxy }}"
privileged: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" privileged: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}"
volumes: "{{ glance_api_default_volumes + glance_api_extra_volumes }}" volumes: "{{ glance_api_default_volumes + glance_api_extra_volumes }}"
dimensions: "{{ glance_api_dimensions }}" dimensions: "{{ glance_api_dimensions }}"
@ -150,6 +150,8 @@ glance_extra_volumes: "{{ default_extra_volumes }}"
glance_api_extra_volumes: "{{ glance_extra_volumes }}" glance_api_extra_volumes: "{{ glance_extra_volumes }}"
glance_tls_proxy_extra_volumes: "{{ glance_extra_volumes }}" glance_tls_proxy_extra_volumes: "{{ glance_extra_volumes }}"
glance_api_container_proxy: "{{ container_proxy }}"
#################### ####################
# Glance # Glance
#################### ####################

4
ansible/roles/magnum/defaults/main.yml
View File

@ -27,7 +27,7 @@ magnum_services:
group: magnum-conductor group: magnum-conductor
enabled: true enabled: true
image: "{{ magnum_conductor_image_full }}" image: "{{ magnum_conductor_image_full }}"
environment: "{{ container_proxy }}" environment: "{{ magnum_conductor_container_proxy }}"
volumes: "{{ magnum_conductor_default_volumes + magnum_conductor_extra_volumes }}" volumes: "{{ magnum_conductor_default_volumes + magnum_conductor_extra_volumes }}"
dimensions: "{{ magnum_conductor_dimensions }}" dimensions: "{{ magnum_conductor_dimensions }}"
@ -84,6 +84,8 @@ magnum_extra_volumes: "{{ default_extra_volumes }}"
magnum_api_extra_volumes: "{{ magnum_extra_volumes }}" magnum_api_extra_volumes: "{{ magnum_extra_volumes }}"
magnum_conductor_extra_volumes: "{{ magnum_extra_volumes }}" magnum_conductor_extra_volumes: "{{ magnum_extra_volumes }}"
magnum_conductor_container_proxy: "{{ container_proxy }}"
#################### ####################
# OpenStack # OpenStack
#################### ####################