Nova: Update bootstrap job

This PS updates the nova boostrap job, both bringing it inline with
other services and also adding the default flavours from Mitaka.
By setting the m1.tiny size to match the upstream it is expected
that the majority of gate failures will be solved - as many of the
VMs in nodepool do not have 20GB of free space on the rootfs.

Change-Id: I767795015422a1b326a6f34b5a3f50bf41a0ca4b
This commit is contained in:
Pete Birley 2017-07-29 20:17:34 -05:00
parent 52903e5076
commit 8f9945f6fd
3 changed files with 38 additions and 10 deletions

View File

@ -17,9 +17,8 @@
set -ex set -ex
export HOME=/tmp export HOME=/tmp
{{ if .Values.bootstrap.enabled }} {{ if .Values.bootstrap.flavors.enabled }}
{{ range .Values.bootstrap.flavors.options }}
{{ range .Values.bootstrap.flavors }}
openstack flavor show {{ .name }} || \ openstack flavor show {{ .name }} || \
openstack flavor create {{ .name }} \ openstack flavor create {{ .name }} \
--id {{ .id }} \ --id {{ .id }} \
@ -27,7 +26,7 @@ openstack flavor show {{ .name }} || \
--disk {{ .disk }} \ --disk {{ .disk }} \
--vcpus {{ .vcpus }} --vcpus {{ .vcpus }}
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ .Values.bootstrap.script | default "echo 'Not Enabled'" }}
exit 0 exit 0

View File

@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
{{- $envAll := . }} {{- $envAll := . }}
{{- if .Values.bootstrap.enabled }}
{{- $dependencies := .Values.dependencies.bootstrap }} {{- $dependencies := .Values.dependencies.bootstrap }}
{{- $mounts_nova_bootstrap := .Values.pod.mounts.nova_bootstrap.nova_bootstrap }} {{- $mounts_nova_bootstrap := .Values.pod.mounts.nova_bootstrap.nova_bootstrap }}
{{- $mounts_nova_bootstrap_init := .Values.pod.mounts.nova_bootstrap.init_container }} {{- $mounts_nova_bootstrap_init := .Values.pod.mounts.nova_bootstrap.init_container }}
@ -60,3 +61,4 @@ spec:
name: nova-bin name: nova-bin
defaultMode: 0555 defaultMode: 0555
{{- if $mounts_nova_bootstrap.volumes }}{{ toYaml $mounts_nova_bootstrap.volumes | indent 8 }}{{ end }} {{- if $mounts_nova_bootstrap.volumes }}{{ toYaml $mounts_nova_bootstrap.volumes | indent 8 }}{{ end }}
{{- end }}

View File

@ -67,13 +67,40 @@ images:
bootstrap: bootstrap:
enabled: true enabled: true
script: null
flavors: flavors:
m1_tiny: enabled: true
name: "m1.tiny" options:
id: "auto" m1_tiny:
ram: 512 name: "m1.tiny"
disk: 20 id: "auto"
vcpus: 1 ram: 512
disk: 1
vcpus: 1
m1_small:
name: "m1.small"
id: "auto"
ram: 2048
disk: 20
vcpus: 1
m1_medium:
name: "m1.medium"
id: "auto"
ram: 4096
disk: 40
vcpus: 2
m1_large:
name: "m1.large"
id: "auto"
ram: 8192
disk: 80
vcpus: 4
m1_xlarge:
name: "m1.xlarge"
id: "auto"
ram: 16384
disk: 160
vcpus: 8
network: network:
dns: dns: