diff --git a/ansible/roles/bifrost/defaults/main.yml b/ansible/roles/bifrost/defaults/main.yml index 6be3d6cf839d3affae7d4c050d2b2aae1f49c1d5..7b171d65c2be97bc5c69572ca3c110edfba359d4 100644 --- a/ansible/roles/bifrost/defaults/main.yml +++ b/ansible/roles/bifrost/defaults/main.yml @@ -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_tag: "{{ bifrost_tag }}" bifrost_deploy_image_full: "{{ bifrost_deploy_image }}:{{ bifrost_deploy_tag }}" + +bifrost_deploy_container_proxy: "{{ container_proxy }}" diff --git a/ansible/roles/bifrost/tasks/start.yml b/ansible/roles/bifrost/tasks/start.yml index c86e7c0d7ab7ef6c346e61d86b67f16607d9eb70..2425c887c4f6b899a08b472ab2936db4d4a06ad6 100644 --- a/ansible/roles/bifrost/tasks/start.yml +++ b/ansible/roles/bifrost/tasks/start.yml @@ -7,7 +7,7 @@ image: "{{ bifrost_deploy_image_full }}" name: "bifrost_deploy" privileged: True - environment: "{{ container_proxy }}" + environment: "{{ bifrost_deploy_container_proxy }}" volumes: - "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro" - "/etc/localtime:/etc/localtime:ro" diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index 79765d37ed1154b90f9995ea3e871e4c6a86195e..e2068709157712f0732a5178bc3b84b47b789a96 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -8,7 +8,7 @@ glance_services: host_in_groups: "{{ inventory_hostname in glance_api_hosts }}" enabled: true image: "{{ glance_api_image_full }}" - environment: "{{ container_proxy }}" + environment: "{{ glance_api_container_proxy }}" privileged: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" volumes: "{{ glance_api_default_volumes + glance_api_extra_volumes }}" dimensions: "{{ glance_api_dimensions }}" @@ -150,6 +150,8 @@ glance_extra_volumes: "{{ default_extra_volumes }}" glance_api_extra_volumes: "{{ glance_extra_volumes }}" glance_tls_proxy_extra_volumes: "{{ glance_extra_volumes }}" +glance_api_container_proxy: "{{ container_proxy }}" + #################### # Glance #################### diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index 414d676bac0331780173e40c2dcb05e11c9246f8..da7ac8730f7eaeb764f5042ae218994c7e00c2fe 100644 --- a/ansible/roles/magnum/defaults/main.yml +++ b/ansible/roles/magnum/defaults/main.yml @@ -27,7 +27,7 @@ magnum_services: group: magnum-conductor enabled: true image: "{{ magnum_conductor_image_full }}" - environment: "{{ container_proxy }}" + environment: "{{ magnum_conductor_container_proxy }}" volumes: "{{ magnum_conductor_default_volumes + magnum_conductor_extra_volumes }}" dimensions: "{{ magnum_conductor_dimensions }}" @@ -84,6 +84,8 @@ magnum_extra_volumes: "{{ default_extra_volumes }}" magnum_api_extra_volumes: "{{ magnum_extra_volumes }}" magnum_conductor_extra_volumes: "{{ magnum_extra_volumes }}" +magnum_conductor_container_proxy: "{{ container_proxy }}" + #################### # OpenStack ####################