openstack/kayobe
Code Issues Proposed changes

Use host networking for inspection store

Browse Source 
Change-Id: I126e500be0b22d65b918a5291cac189425be51b9
Story: 2003207
Task:  23365
This commit is contained in:
Will Szumski
2018-08-01 15:17:22 +01:00
parent 10382bce9e
commit 2ddcd94cd4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/inspection-store/defaults/main.yml
View File

@@ -14,8 +14,7 @@ inspection_store_services:
container_name: inspection_store container_name: inspection_store
enabled: "{{ inspection_store_enabled }}" enabled: "{{ inspection_store_enabled }}"
image: "{{ inspection_store_image_full }}" image: "{{ inspection_store_image_full }}"
ports: network_mode: host
- "{{ inspection_store_port }}:80"
volumes: volumes:
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "{{ inspection_store_config_path }}/nginx.conf:/etc/nginx/nginx.conf:ro" - "{{ inspection_store_config_path }}/nginx.conf:/etc/nginx/nginx.conf:ro"

1
ansible/roles/inspection-store/tasks/start.yml
View File

@@ -10,6 +10,7 @@
restart_retries: "{{ inspection_store_restart_retries | default(omit) }}" restart_retries: "{{ inspection_store_restart_retries | default(omit) }}"
state: "{{ item.value.enabled | ternary('started', 'absent') }}" state: "{{ item.value.enabled | ternary('started', 'absent') }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
network_mode: "{{ item.value.network_mode | default(omit) }}"
with_dict: "{{ inspection_store_services }}" with_dict: "{{ inspection_store_services }}"
notify: notify:
- Ensure inspection store data directory exists - Ensure inspection store data directory exists

2
ansible/roles/inspection-store/templates/nginx.conf
View File

@@ -28,7 +28,7 @@ http {
#gzip on; #gzip on;
server { server {
listen 80; listen {{ inspection_store_port }};
root /data; root /data;
location /ironic-inspector { location /ironic-inspector {
return 200 ""; return 200 "";