Merge pull request #302 from renmak/stnd_control_plane_node_issue_207

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

View File

@ -31,7 +31,7 @@ spec:
]'
spec:
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:
runAsUser: 0
hostNetwork: true

View File

@ -31,7 +31,7 @@ spec:
]'
spec:
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:
runAsUser: 0
hostNetwork: true

View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: nova-api-metadata
spec:
replicas: {{ .Values.control_replicas }}
replicas: {{ .Values.replicas.api_metadata }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]'
spec:
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:
- name: nova-api
image: {{ .Values.images.api }}

View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: nova-api-osapi
spec:
replicas: {{ .Values.control_replicas }}
replicas: {{ .Values.replicas.osapi }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]'
spec:
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:
- name: nova-osapi
image: {{ .Values.images.api }}

View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: nova-conductor
spec:
replicas: {{ .Values.control_replicas }}
replicas: {{ .Values.replicas.conductor }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]'
spec:
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:
- name: nova-conductor
image: {{ .Values.images.conductor }}

View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: nova-consoleauth
spec:
replicas: {{ .Values.control_replicas }}
replicas: {{ .Values.replicas.consoleauth }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]'
spec:
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:
- name: nova-consoleauth
image: {{ .Values.images.consoleauth }}

View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: nova-scheduler
spec:
replicas: {{ .Values.control_replicas }}
replicas: {{ .Values.replicas.scheduler }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
@ -40,7 +40,7 @@ spec:
]'
spec:
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:
- name: nova-scheduler
image: {{ .Values.images.scheduler }}

View File

@ -28,7 +28,7 @@ spec:
spec:
restartPolicy: OnFailure
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:
- name: nova-db-init
image: {{ .Values.images.db_init }}

View File

@ -28,7 +28,7 @@ spec:
spec:
restartPolicy: OnFailure
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:
- name: nova-db-sync
image: {{ .Values.images.db_sync }}

View File

@ -29,7 +29,7 @@ spec:
spec:
restartPolicy: OnFailure
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:
{{- range $key1, $osServiceType := tuple "compute" }}
{{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}

View File

@ -29,7 +29,7 @@ spec:
spec:
restartPolicy: OnFailure
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:
{{- range $key1, $osServiceType := tuple "compute" }}
- name: {{ $osServiceType }}-ks-service-registration

View File

@ -30,7 +30,7 @@ spec:
spec:
restartPolicy: OnFailure
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:
- name: nova-ks-user
image: {{ .Values.images.ks_user }}

View File

@ -18,13 +18,38 @@
# name: value
labels:
control_node_selector_key: openstack-control-plane
control_node_selector_value: enabled
compute_node_selector_key: openstack-compute-node
compute_node_selector_value: enabled
agent:
compute:
node_selector_key: openstack-compute-node
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
compute_replicas: 1
replicas:
api_metadata: 1
osapi: 1
conductor: 1
consoleauth: 1
scheduler: 1
images:
db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton