Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add env variable to all dockers #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add env variable to all dockers #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ docker_common_options:
auth_username: "{{ docker_registry_username }}"
environment:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
VIRTUAL_ENV: true
restart_policy: "{{ docker_restart_policy }}"
restart_retries: "{{ docker_restart_policy_retry }}"
graceful_timeout: "{{ docker_graceful_timeout }}"
Expand Down
11 changes: 7 additions & 4 deletions ansible/roles/cinder/templates/cinder.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[DEFAULT]
debug = {{ cinder_logging_debug }}

log_dir = /var/log/kolla/cinder
{% if service_name == "cinder-api" %}
log_file = cinder-api.log
Expand All @@ -13,7 +12,9 @@ use_stderr = False

my_ip = {{ api_interface_address }}

volume_name_template = volume-%s

osapi_volume_workers = {{ openstack_service_workers }}
volume_name_template = vol_%s

glance_api_servers = {{ glance_internal_endpoint }}

Expand Down Expand Up @@ -112,6 +113,8 @@ max_pool_size = {{ database_max_pool_size }}
max_retries = -1

[keystone_authtoken]
service_token_roles = service
service_token_roles_required = true
service_type = volume
# security fix, always validate service tokens
# see: https://security.openstack.org/ossa/OSSA-2023-003.html
Expand Down Expand Up @@ -237,8 +240,8 @@ san_ip = {{ pure_san_ip }}
pure_api_token = {{ pure_api_token }}
{% endif %}

[privsep_entrypoint]
helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --config-file /etc/cinder/cinder.conf
[privsep_osbrick]
helper_command = sudo -E cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --config-file /etc/cinder/cinder.conf

{% if enable_osprofiler | bool %}
[profiler]
Expand Down
11 changes: 8 additions & 3 deletions ansible/roles/nova-cell/templates/nova.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ rabbit_quorum_queue = true
policy_file = {{ nova_policy_file }}
{% endif %}

[privsep_entrypoint]
helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf
[privsep_osbrick]
helper_command = sudo -E nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf

[guestfs]
debug = {{ nova_logging_debug }}
Expand Down Expand Up @@ -268,7 +268,9 @@ passthrough_whitelist = {{ nova_pci_passthrough_whitelist | to_json }}
{% endif %}

[service_user]
send_service_user_token = true
send_service_user_token = True
service_type = compute
www_authenticate_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_internal_url }}
auth_type = password
project_domain_id = {{ default_project_domain_id }}
Expand All @@ -279,3 +281,6 @@ password = {{ nova_keystone_password }}
cafile = {{ openstack_cacert }}
region_name = {{ openstack_region_name }}
valid_interfaces = internal
memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
11 changes: 8 additions & 3 deletions ansible/roles/nova/templates/nova.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ rabbit_quorum_queue = true
policy_file = {{ nova_policy_file }}
{% endif %}

[privsep_entrypoint]
helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf
[privsep_osbrick]
helper_command = sudo -E nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf

[guestfs]
debug = {{ nova_logging_debug }}
Expand Down Expand Up @@ -209,7 +209,9 @@ verify_ssl_path = {{ openstack_cacert }}
{% endif %}

[service_user]
send_service_user_token = true
send_service_user_token = True
service_type = compute
www_authenticate_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_internal_url }}
auth_type = password
project_domain_id = {{ default_project_domain_id }}
Expand All @@ -220,3 +222,6 @@ password = {{ nova_keystone_password }}
cafile = {{ openstack_cacert }}
region_name = {{ openstack_region_name }}
valid_interfaces = internal
memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}