openstack/openstack-helm
Code Issues Proposed changes

Merge branch 'master' of https://github.com/att-comdev/openstack-helm into yaodu/keystone

Browse Source
This commit is contained in:
Pete Birley 2017-01-19 23:08:18 +00:00
commit eca1f8e31a
55 changed files with 196 additions and 922 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cinder/templates/deployment-api.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,29 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
cinder/templates/deployment-scheduler.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.scheduler }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,29 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
cinder/templates/deployment-volume.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.volume }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,29 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.volume.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.volume.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
cinder/templates/job-db-init.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

26
cinder/templates/job-db-sync.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

21
cinder/templates/job-ks-endpoints.yaml.yaml
View File

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := $envAll.Values.keystone.admin_secret | default "cinder-env-keystone-admin" }} {{- $ksAdminSecret := $envAll.Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $dependecies := .Values.dependencies.ks_endpoints }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -9,25 +10,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

21
cinder/templates/job-ks-service.yaml
View File

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }} {{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $dependecies := .Values.dependencies.ks_service }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -9,25 +10,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

22
cinder/templates/job-ks-user.yaml
View File

@ -1,5 +1,7 @@
{{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }} {{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $ksUserSecret := .Values.keystone.user_secret | default "cinder-env-keystone-user" }} {{- $ksUserSecret := .Values.keystone.user_secret | default "cinder-env-keystone-user" }}
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.ks_user }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -9,25 +11,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_user.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

32
common/templates/_funcs.tpl
View File

@ -21,3 +21,35 @@
{{- $wtf := $context.Template.Name | replace $last $name -}} {{- $wtf := $context.Template.Name | replace $last $name -}}
{{- include $wtf $context | sha256sum | quote -}} {{- include $wtf $context | sha256sum | quote -}}
{{- end -}} {{- end -}}
{{- define "dep-check-init-cont" -}}
{{- $envAll := index . 0 -}}
{{- $deps := index . 1 -}}
{
"name": "init",
"image": {{ $envAll.Values.images.dep_check | quote }},
"imagePullPolicy": {{ $envAll.Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ $envAll.Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" $deps.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" $deps.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
{{- end -}}

27
glance/templates/api.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -18,34 +20,11 @@ spec:
app: glance-api app: glance-api
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers: containers:
- name: glance-api - name: glance-api
image: {{ .Values.images.api }} image: {{ .Values.images.api }}

26
glance/templates/db-sync.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

26
glance/templates/init.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

26
glance/templates/post.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.post }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
glance/templates/registry.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.registry }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -10,29 +12,7 @@ spec:
app: glance-registry app: glance-registry
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.registry.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.registry.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

1
glance/values.yaml
View File

@ -15,6 +15,7 @@ images:
init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
registry: quay.io/stackanetes/stackanetes-glance-registry:newton registry: quay.io/stackanetes/stackanetes-glance-registry:newton
post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades:

26
heat/templates/deployment-api.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -10,29 +12,7 @@ spec:
app: heat-api app: heat-api
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
heat/templates/deployment-cfn.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.cfn }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -10,29 +12,7 @@ spec:
app: heat-cfn app: heat-cfn
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.cfn.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.cfn.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
heat/templates/deployment-cloudwatch.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.cloudwatch }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -10,29 +12,7 @@ spec:
app: heat-cloudwatch app: heat-cloudwatch
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.cloudwatch.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.cloudwatch.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

8
heat/templates/etc/_heat.conf.tpl
View File

@ -80,3 +80,11 @@ region_name = {{ .Values.keystone.heat_trustee_region_name }}
user_domain_name = {{ .Values.keystone.heat_trustee_user_domain }} user_domain_name = {{ .Values.keystone.heat_trustee_user_domain }}
username = {{ .Values.keystone.heat_trustee_user }} username = {{ .Values.keystone.heat_trustee_user }}
password = {{ .Values.keystone.heat_trustee_password }} password = {{ .Values.keystone.heat_trustee_password }}
[clients]
endpoint_type = internalURL
[clients_keystone]
endpoint_type = internalURL
auth_uri = {{ include "endpoint_keystone_internal" . }}

26
heat/templates/job-db-init.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

26
heat/templates/job-db-sync.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

21
heat/templates/job-ks-endpoints.yaml.yaml
View File

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }} {{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $dependecies := .Values.dependencies.ks_endpoints }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -9,25 +10,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

21
heat/templates/job-ks-service.yaml
View File

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }} {{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $dependecies := .Values.dependencies.ks_service }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -9,25 +10,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

22
heat/templates/job-ks-user.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.ks_user }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }} {{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $ksUserSecret := .Values.keystone_secrets.user }} {{- $ksUserSecret := .Values.keystone_secrets.user }}
# The heat user management job is a bit different from other services as it also needs to create a stack domain and trusts user # The heat user management job is a bit different from other services as it also needs to create a stack domain and trusts user
@ -12,25 +14,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_user.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

33
heat/templates/statefulset-engine.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.engine }}
apiVersion: apps/v1beta1 apiVersion: apps/v1beta1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
@ -11,29 +13,7 @@ spec:
app: heat-engine app: heat-engine
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.engine.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.engine.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
@ -55,6 +35,10 @@ spec:
mountPath: /etc/heat/conf/heat.conf mountPath: /etc/heat/conf/heat.conf
subPath: heat.conf subPath: heat.conf
readOnly: true readOnly: true
- name: heatpolicy
mountPath: /etc/heat/policy.json
subPath: policy.json
readOnly: true
volumes: volumes:
- name: pod-etc-heat - name: pod-etc-heat
emptyDir: {} emptyDir: {}
@ -63,3 +47,6 @@ spec:
- name: heatconf - name: heatconf
configMap: configMap:
name: heat-etc name: heat-etc
- name: heatpolicy
configMap:
name: heat-etc

2
heat/values.yaml
View File

@ -108,7 +108,7 @@ resources:
workers: 8 workers: 8
misc: misc:
debug: false debug: true
secrets: secrets:
keystone_admin: keystone_admin:

24
horizon/templates/deployment.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.dashboard }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,26 +22,8 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init", ]'
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.dashboard.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

2
horizon/values.yaml
View File

@ -6,7 +6,7 @@
replicas: 1 replicas: 1
images: images:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
horizon: quay.io/stackanetes/stackanetes-horizon:newton horizon: quay.io/stackanetes/stackanetes-horizon:newton
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

30
keystone/templates/deployment.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,33 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:

26
keystone/templates/job-db-sync.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

26
keystone/templates/job-init.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,29 +9,7 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure

2
keystone/values.yaml
View File

@ -13,7 +13,7 @@ images:
db_sync: quay.io/stackanetes/stackanetes-keystone-api:newton db_sync: quay.io/stackanetes/stackanetes-keystone-api:newton
api: quay.io/stackanetes/stackanetes-keystone-api:newton api: quay.io/stackanetes/stackanetes-keystone-api:newton
init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades:

3
maas/templates/_helpers.tpl
View File

@ -1,3 +0,0 @@
{{- define "joinListWithColon" -}}
{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }}
{{- end -}}

33
maas/templates/var/_maas-region-controller.postinst.tpl → maas/templates/bin/_maas-region-controller.postinst.tpl
View File

@ -35,30 +35,6 @@ configure_maas_default_url() {
maas-region local_config_set --maas-url "http://${ipaddr}/MAAS" maas-region local_config_set --maas-url "http://${ipaddr}/MAAS"
} }
get_default_route_ip6() {
while read Src SrcPref Dest DestPref Gateway Metric RefCnt Use Flags Iface
do
[ "$SrcPref" = 00 ] && [ "$Iface" != lo ] && break
done < /proc/net/ipv6_route
if [ -n "$Iface" ]; then
LC_ALL=C /sbin/ip -6 addr list dev "$Iface" scope global permanent |
sed -n '/ inet6 /s/.*inet6 \([0-9a-fA-F:]*\).*/[\1]/p' | head -1
fi
}
get_default_route_ip4() {
while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
do
[ "$Mask" = "00000000" ] && break
done < /proc/net/route
if [ -n "$Iface" ]; then
ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$Iface" scope global)
ipaddr=${ipaddr#* inet }
ipaddr=${ipaddr%%/*}
echo $ipaddr
fi
}
extract_default_maas_url() { extract_default_maas_url() {
# Extract DEFAULT_MAAS_URL IP/host setting from config file $1. # Extract DEFAULT_MAAS_URL IP/host setting from config file $1.
grep "^DEFAULT_MAAS_URL" "$1" | cut -d"/" -f3 grep "^DEFAULT_MAAS_URL" "$1" | cut -d"/" -f3
@ -86,17 +62,8 @@ if [ "$1" = "configure" ] && [ -z "$2" ]; then
db_get maas/default-maas-url db_get maas/default-maas-url
ipaddr="$RET" ipaddr="$RET"
if [ -z "$ipaddr" ]; then if [ -z "$ipaddr" ]; then
#ipaddr=$(get_default_route_ip4)
ipaddr="maas-region-ui.{{ .Release.Namespace }}" ipaddr="maas-region-ui.{{ .Release.Namespace }}"
fi fi
if [ -z "$ipaddr" ]; then
#ipaddr=$(get_default_route_ip6)
ipaddr="maas-region-ui.{{ .Release.Namespace }}"
fi
# Fallback default is "localhost"
if [ -z "$ipaddr" ]; then
ipaddr=localhost
fi
# Set the IP address of the interface with default route # Set the IP address of the interface with default route
configure_maas_default_url "$ipaddr" configure_maas_default_url "$ipaddr"
db_subst maas/installation-note MAAS_URL "$ipaddr" db_subst maas/installation-note MAAS_URL "$ipaddr"

2
maas/templates/configmap-bin.yaml
View File

@ -5,3 +5,5 @@ metadata:
data: data:
start.sh: | start.sh: |
{{ tuple "bin/_start.sh.tpl" . | include "template" | indent 4 }} {{ tuple "bin/_start.sh.tpl" . | include "template" | indent 4 }}
maas-region-controller.postinst: |
{{ tuple "bin/_maas-region-controller.postinst.tpl" . | include "template" | indent 4 }}

2
maas/templates/configmap-etc.yaml
View File

@ -5,3 +5,5 @@ metadata:
data: data:
named.conf.options: |+ named.conf.options: |+
{{ tuple "etc/_region-dns-config.tpl" . | include "template" | indent 4 }} {{ tuple "etc/_region-dns-config.tpl" . | include "template" | indent 4 }}
secret: |
{{ tuple "etc/_secret.tpl" . | include "template" | indent 4 }}

10
maas/templates/configmap-var.yaml
View File

@ -1,10 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: maas-region-var
data:
maas-region-controller.postinst: |
{{ tuple "var/_maas-region-controller.postinst.tpl" . | include "template" | indent 4 }}
secret: |
{{ tuple "var/_secret.tpl" . | include "template" | indent 4 }}

14
maas/templates/deploy-region.yaml
View File

@ -14,12 +14,7 @@ spec:
"name": "init", "name": "init",
"image": "{{ .Values.images.maas_region }}", "image": "{{ .Values.images.maas_region }}",
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"command": [ "command": ["bash", "/tmp/start.sh"],
"/bin/bash", "-c"
],
"args": [
"chmod +x /tmp/start.sh; /tmp/start.sh"
],
"volumeMounts": [ "volumeMounts": [
{ {
"name": "maas-config", "name": "maas-config",
@ -59,6 +54,9 @@ spec:
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: {{ .Values.network.port.region_container }} - containerPort: {{ .Values.network.port.region_container }}
readinessProbe:
tcpSocket:
port: {{ .Values.network.port.region_container }}
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:
@ -91,7 +89,7 @@ spec:
emptyDir: {} emptyDir: {}
- name: maas-region-secret - name: maas-region-secret
configMap: configMap:
name: maas-region-var name: maas-region-etc
- name: maas-config - name: maas-config
emptyDir: {} emptyDir: {}
- name: maas-dns-config - name: maas-dns-config
@ -102,4 +100,4 @@ spec:
name: maas-region-bin name: maas-region-bin
- name: maasregionpostinst - name: maasregionpostinst
configMap: configMap:
name: maas-region-var name: maas-region-bin

0
maas/templates/var/_secret.tpl → maas/templates/etc/_secret.tpl
View File

1
maas/templates/service.yaml
View File

@ -5,7 +5,6 @@ metadata:
labels: labels:
app: maas-region-ui app: maas-region-ui
spec: spec:
type: NodePort
ports: ports:
- port: {{ .Values.network.port.service_gui }} - port: {{ .Values.network.port.service_gui }}
targetPort: {{ .Values.network.port.service_gui_target }} targetPort: {{ .Values.network.port.service_gui_target }}

2
maas/values.yaml
View File

@ -4,7 +4,7 @@
images: images:
maas_region: quay.io/attcomdev/maas-region:2.1.2-1 maas_region: quay.io/attcomdev/maas-region:2.1.2-1
maas_rack: quay.io/attcomdev/maas-rack:2.1.2 maas_rack: quay.io/attcomdev/maas-rack:2.1.2-1
labels: labels:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane

4
neutron/templates/job-db-sync.yaml
View File

@ -7,7 +7,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
containers: containers:
- name: neutron-db-sync - name: neutron-db-sync
image: {{ .Values.images.db_sync }} image: {{ .Values.images.db_sync }}
@ -42,4 +42,4 @@ spec:
name: neutron-etc name: neutron-etc
- name: ml2confini - name: ml2confini
configMap: configMap:
name: neutron-etc name: neutron-etc

4
neutron/templates/job-init.yaml
View File

@ -7,7 +7,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
containers: containers:
- name: neutron-init - name: neutron-init
image: {{ .Values.images.init }} image: {{ .Values.images.init }}
@ -36,4 +36,4 @@ spec:
volumes: volumes:
- name: initsh - name: initsh
configMap: configMap:
name: neutron-bin name: neutron-bin

4
neutron/templates/job-post.yaml
View File

@ -7,7 +7,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
containers: containers:
- name: neutron-post - name: neutron-post
image: {{ .Values.images.post }} image: {{ .Values.images.post }}
@ -38,4 +38,4 @@ spec:
volumes: volumes:
- name: postsh - name: postsh
configMap: configMap:
name: neutron-bin name: neutron-bin

34
nova/templates/daemonset-compute.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.compute }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
@ -11,33 +13,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.compute.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.compute.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
@ -49,8 +25,8 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: nova-compute - name: nova-compute
image: {{ .Values.image.compute }} image: {{ .Values.images.compute }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
command: command:

34
nova/templates/daemonset-libvirt.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.libvirt }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
@ -11,33 +13,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.libvirt.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.libvirt.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
@ -48,8 +24,8 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: nova-libvirt - name: nova-libvirt
image: {{ .Values.image.libvirt }} image: {{ .Values.images.libvirt }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
command: command:

36
nova/templates/deployment-api-metadata.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,41 +22,15 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-api-metadata - name: nova-api
image: {{ .Values.image.api }} image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
# https://bugs.launchpad.net/kolla-mesos/+bug/1546007 # https://bugs.launchpad.net/kolla-mesos/+bug/1546007
securityContext: securityContext:
capabilities: capabilities:

34
nova/templates/deployment-api-osapi.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,40 +22,14 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-api-osapi - name: nova-osapi
image: {{ .Values.image.api }} image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
securityContext: securityContext:
capabilities: capabilities:

32
nova/templates/deployment-conductor.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.conductor }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,40 +22,14 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.conductor.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.conductor.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-conductor - name: nova-conductor
image: {{ .Values.image.conductor }} image: {{ .Values.images.conductor }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
command: command:
- nova-conductor - nova-conductor

32
nova/templates/deployment-consoleauth.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.consoleauth }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,40 +22,14 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.consoleauth.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.consoleauth.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-consoleauth - name: nova-consoleauth
image: {{ .Values.image.consoleauth }} image: {{ .Values.images.consoleauth }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
command: command:
- nova-consoleauth - nova-consoleauth

32
nova/templates/deployment-scheduler.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.scheduler }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -20,40 +22,14 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-scheduler - name: nova-scheduler
image: {{ .Values.image.scheduler }} image: {{ .Values.images.scheduler }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
command: command:
- nova-scheduler - nova-scheduler

32
nova/templates/job-db-sync.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,38 +9,16 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-db-sync - name: nova-db-sync
image: {{ .Values.image.db_sync }} image: {{ .Values.images.db_sync }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
command: command:
- bash - bash
- /tmp/db-sync.sh - /tmp/db-sync.sh

32
nova/templates/job-init.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,38 +9,16 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-init - name: nova-init
image: {{ .Values.image.init }} image: {{ .Values.images.init }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
command: command:
- bash - bash
- /tmp/init.sh - /tmp/init.sh

32
nova/templates/job-post.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.post }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -7,38 +9,16 @@ spec:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ pod.beta.kubernetes.io/init-containers: '[
{ {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]' ]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-post - name: nova-post
image: {{ .Values.image.post }} image: {{ .Values.images.post }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
command: command:
- bash - bash
- /tmp/post.sh - /tmp/post.sh

4
nova/values.yaml
View File

@ -12,7 +12,7 @@ labels:
control_replicas: 1 control_replicas: 1
compute_replicas: 1 compute_replicas: 1
image: images:
init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
db_sync: quay.io/stackanetes/stackanetes-nova-api:newton db_sync: quay.io/stackanetes/stackanetes-nova-api:newton
api: quay.io/stackanetes/stackanetes-nova-api:newton api: quay.io/stackanetes/stackanetes-nova-api:newton
@ -23,7 +23,7 @@ image:
compute: quay.io/stackanetes/stackanetes-nova-compute:newton compute: quay.io/stackanetes/stackanetes-nova-compute:newton
libvirt: quay.io/stackanetes/stackanetes-nova-libvirt:newton libvirt: quay.io/stackanetes/stackanetes-nova-libvirt:newton
post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades: