[WIP] TLS support for Cinder services
Change-Id: Ie24abf9767db88361eb247c4363e7dedfe30d934
This commit is contained in:
parent
c7518fc787
commit
0ea6e49189
|
@ -98,13 +98,48 @@ service:
|
|||
daemon:
|
||||
command: cinder-api --config-file /etc/cinder/cinder.conf
|
||||
files:
|
||||
# {% if security.tls.enabled %}
|
||||
- ca_cert
|
||||
# {% endif %}
|
||||
- cinder-conf
|
||||
dependencies:
|
||||
- memcached
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
# {% if security.tls.enabled %}
|
||||
- name: nginx
|
||||
image: nginx
|
||||
daemon:
|
||||
files:
|
||||
- upstreams
|
||||
- servers
|
||||
- server-cert
|
||||
- server-key
|
||||
command: nginx
|
||||
# {% endif %}
|
||||
|
||||
files:
|
||||
cinder-conf:
|
||||
path: /etc/cinder/cinder.conf
|
||||
content: cinder.conf.j2
|
||||
# {% if security.tls.enabled %}
|
||||
servers:
|
||||
path: /etc/nginx/conf.d/servers.conf
|
||||
content: nginx-api.conf.j2
|
||||
perm: "0400"
|
||||
ca_cert:
|
||||
path: /opt/ccp/etc/tls/ca.pem
|
||||
content: ca-cert.pem.j2
|
||||
upstreams:
|
||||
path: /etc/nginx/conf.d/upstreams.conf
|
||||
content: upstreams.conf.j2
|
||||
perm: "0400"
|
||||
server-cert:
|
||||
path: /etc/nginx/ssl/certs/server-cert.pem
|
||||
content: server-cert.pem.j2
|
||||
perm: "0400"
|
||||
server-key:
|
||||
path: /etc/nginx/ssl/private/server-key.pem
|
||||
content: server-key.pem.j2
|
||||
perm: "0400"
|
||||
# {% endif %}
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
{{ security.tls.ca_cert }}
|
|
@ -14,7 +14,11 @@ os_region_name = RegionOne
|
|||
|
||||
enabled_backends = {{ cinder.enabled_backends }}
|
||||
|
||||
{% if security.tls.enabled %}
|
||||
bind_host = 127.0.0.1
|
||||
{% else %}
|
||||
osapi_volume_listen = {{ network_topology["private"]["address"] }}
|
||||
{% endif %}
|
||||
osapi_volume_listen_port = {{ cinder.api_port.cont }}
|
||||
|
||||
api_paste_config = /etc/cinder/api-paste.ini
|
||||
|
@ -31,6 +35,9 @@ max_retries = -1
|
|||
auth_version = v3
|
||||
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
|
||||
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
|
||||
{% if security.tls.enabled %}
|
||||
cafile = /opt/ccp/etc/tls/ca.pem
|
||||
{% endif %}
|
||||
auth_type = password
|
||||
project_domain_id = default
|
||||
user_domain_id = default
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
server {
|
||||
listen {{ cinder.api_port.cont }};
|
||||
ssl on;
|
||||
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
ssl_ciphers {{ security.tls.ciphers }};
|
||||
ssl_prefer_server_ciphers on;
|
||||
ssl_certificate /etc/nginx/ssl/certs/server-cert.pem;
|
||||
ssl_certificate_key /etc/nginx/ssl/private/server-key.pem;
|
||||
# allows to upload images without being cut off at some low size
|
||||
client_max_body_size 0;
|
||||
|
||||
location / {
|
||||
proxy_pass http://cinder_api;
|
||||
proxy_set_header Host $host:$server_port;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
|
@ -0,0 +1 @@
|
|||
{{ security.tls.server_cert }}
|
|
@ -0,0 +1 @@
|
|||
{{ security.tls.server_key }}
|
|
@ -0,0 +1,3 @@
|
|||
upstream cinder_api {
|
||||
server 127.0.0.1:{{ cinder.api_port.cont }};
|
||||
}
|
Loading…
Reference in New Issue