openstack/openstack-helm
Code Issues Proposed changes

Ironic: Move all config to be directly values driven.

Browse Source 
This PS moves all the config files to be directly values driven,
both simplifying over-ride and allowing configs to be targeted
to pods in future work.

Change-Id: I177ddfe8c932733aeacb0fdb9b3e60ef75881c6a
This commit is contained in:
portdirect 2018-03-30 00:52:03 -04:00 committed by Pete Birley
parent 3dfb5d5dc7
commit 7d241e7a6c
4 changed files with 37 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ironic/templates/configmap-etc.yaml
View File

@ -194,22 +194,6 @@ data:
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | indent 4 }} {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | indent 4 }}
policy.json: | policy.json: |
{{ toJson .Values.conf.policy | indent 4 }} {{ toJson .Values.conf.policy | indent 4 }}
tftp-map-file: | {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.tftp_map_file "key" "tftp-map-file") | indent 2 }}
{{ if .Values.conf.tftp_map_file.override -}} {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.nginx "key" "nginx.conf") | indent 2 }}
{{ .Values.conf.tftp_map_file.override | indent 4 }} {{- end }}
{{- else -}}
{{ tuple "etc/_tftp-map-file.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- if .Values.conf.tftp_map_file.append -}}
{{ .Values.conf.tftp_map_file.append | indent 4 }}
{{- end }}
nginx.conf: |
{{ if .Values.conf.nginx.override -}}
{{ .Values.conf.nginx.override | indent 4 }}
{{- else -}}
{{ tuple "etc/_nginx.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- if .Values.conf.nginx.append -}}
{{ .Values.conf.nginx.append | indent 4 }}
{{- end }}
{{- end }}

41
ironic/templates/etc/_nginx.conf.tpl
View File

@ -1,41 +0,0 @@
user nginx;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
keepalive_timeout 65;
#gzip on;
server {
listen OSH_PXE_IP:{{ tuple "baremetal" "internal" "pxe_http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }};
server_name localhost;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
location / {
root /var/lib/openstack-helm/httpboot;
}
}
}

4
ironic/templates/etc/_tftp-map-file.tpl
View File

@ -1,4 +0,0 @@
re ^(/tftpboot/) /tftpboot/\2
re ^/tftpboot/ /tftpboot/
re ^(^/) /tftpboot/\1
re ^([^/]) /tftpboot/\1

40
ironic/values.yaml
View File

@ -53,12 +53,40 @@ conf:
override: override:
append: append:
policy: {} policy: {}
tftp_map_file: tftp_map_file: |
override: re ^(/tftpboot/) /tftpboot/\2
append: re ^/tftpboot/ /tftpboot/
nginx: re ^(^/) /tftpboot/\1
override: re ^([^/]) /tftpboot/\1
append: nginx: |
user nginx;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
keepalive_timeout 65;
#gzip on;
server {
listen OSH_PXE_IP:{{ tuple "baremetal" "internal" "pxe_http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }};
server_name localhost;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
location / {
root /var/lib/openstack-helm/httpboot;
}
}
}
ironic: ironic:
DEFAULT: DEFAULT:
enabled_drivers: agent_ipmitool enabled_drivers: agent_ipmitool