openstack/openstack-helm
Code Issues Proposed changes

Merge pull request #302 from renmak/stnd_control_plane_node_issue_207

Browse Source 
Issue #207 Stnd control plane node issue
This commit is contained in:
wilkers-steve 2017-04-07 10:16:47 -05:00 committed by GitHub
commit 4cec28b1f5
13 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }} {{ .Values.labels.agent.compute.node_selector_key }}: {{ .Values.labels.agent.compute.node_selector_value }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
hostNetwork: true hostNetwork: true

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

@ -31,7 +31,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }} {{ .Values.labels.agent.libvirt.node_selector_key }}: {{ .Values.labels.agent.libvirt.node_selector_value }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
hostNetwork: true hostNetwork: true

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

@ -19,7 +19,7 @@ kind: Deployment
metadata: metadata:
name: nova-api-metadata name: nova-api-metadata
spec: spec:
replicas: {{ .Values.control_replicas }} replicas: {{ .Values.replicas.api_metadata }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.api_metadata.node_selector_key }}: {{ .Values.labels.api_metadata.node_selector_value }}
containers: containers:
- name: nova-api - name: nova-api
image: {{ .Values.images.api }} image: {{ .Values.images.api }}

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

@ -19,7 +19,7 @@ kind: Deployment
metadata: metadata:
name: nova-api-osapi name: nova-api-osapi
spec: spec:
replicas: {{ .Values.control_replicas }} replicas: {{ .Values.replicas.osapi }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.osapi.node_selector_key }}: {{ .Values.labels.osapi.node_selector_value }}
containers: containers:
- name: nova-osapi - name: nova-osapi
image: {{ .Values.images.api }} image: {{ .Values.images.api }}

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

@ -19,7 +19,7 @@ kind: Deployment
metadata: metadata:
name: nova-conductor name: nova-conductor
spec: spec:
replicas: {{ .Values.control_replicas }} replicas: {{ .Values.replicas.conductor }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.conductor.node_selector_key }}: {{ .Values.labels.conductor.node_selector_value }}
containers: containers:
- name: nova-conductor - name: nova-conductor
image: {{ .Values.images.conductor }} image: {{ .Values.images.conductor }}

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

@ -19,7 +19,7 @@ kind: Deployment
metadata: metadata:
name: nova-consoleauth name: nova-consoleauth
spec: spec:
replicas: {{ .Values.control_replicas }} replicas: {{ .Values.replicas.consoleauth }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.consoleauth.node_selector_key }}: {{ .Values.labels.consoleauth.node_selector_value }}
containers: containers:
- name: nova-consoleauth - name: nova-consoleauth
image: {{ .Values.images.consoleauth }} image: {{ .Values.images.consoleauth }}

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

@ -19,7 +19,7 @@ kind: Deployment
metadata: metadata:
name: nova-scheduler name: nova-scheduler
spec: spec:
replicas: {{ .Values.control_replicas }} replicas: {{ .Values.replicas.scheduler }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]' ]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.scheduler.node_selector_key }}: {{ .Values.labels.scheduler.node_selector_value }}
containers: containers:
- name: nova-scheduler - name: nova-scheduler
image: {{ .Values.images.scheduler }} image: {{ .Values.images.scheduler }}

2
nova/templates/job-db-init.yaml
View File

@ -28,7 +28,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
containers: containers:
- name: nova-db-init - name: nova-db-init
image: {{ .Values.images.db_init }} image: {{ .Values.images.db_init }}

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

@ -28,7 +28,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
containers: containers:
- name: nova-db-sync - name: nova-db-sync
image: {{ .Values.images.db_sync }} image: {{ .Values.images.db_sync }}

2
nova/templates/job-ks-endpoints.yaml
View File

@ -29,7 +29,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
containers: containers:
{{- range $key1, $osServiceType := tuple "compute" }} {{- range $key1, $osServiceType := tuple "compute" }}
{{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}

2
nova/templates/job-ks-service.yaml
View File

@ -29,7 +29,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
containers: containers:
{{- range $key1, $osServiceType := tuple "compute" }} {{- range $key1, $osServiceType := tuple "compute" }}
- name: {{ $osServiceType }}-ks-service-registration - name: {{ $osServiceType }}-ks-service-registration

2
nova/templates/job-ks-user.yaml
View File

@ -30,7 +30,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
containers: containers:
- name: nova-ks-user - name: nova-ks-user
image: {{ .Values.images.ks_user }} image: {{ .Values.images.ks_user }}

37
nova/values.yaml
View File

@ -18,13 +18,38 @@
# name: value # name: value
labels: labels:
control_node_selector_key: openstack-control-plane agent:
control_node_selector_value: enabled compute:
compute_node_selector_key: openstack-compute-node node_selector_key: openstack-compute-node
compute_node_selector_value: enabled node_selector_value: enabled
libvirt:
node_selector_key: openstack-compute-node
node_selector_value: enabled
conductor:
node_selector_key: openstack-control-plane
node_selector_value: enabled
consoleauth:
node_selector_key: openstack-control-plane
node_selector_value: enabled
scheduler:
node_selector_key: openstack-control-plane
node_selector_value: enabled
osapi:
node_selector_key: openstack-control-plane
node_selector_value: enabled
api_metadata:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
control_replicas: 1 replicas:
compute_replicas: 1 api_metadata: 1
osapi: 1
conductor: 1
consoleauth: 1
scheduler: 1
images: images:
db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton