Add image id to glance bootstrap for tempest test

This PS add glance image id to bootstrap, so we can make image
with predefined id for tempest test.

Change-Id: I061af4daa9574f87d82d68fcf3b7a3674436d3cf
Implements: blueprint specify-glance-image-id

glance/templates/bin/_bootstrap.sh.tpl

@@ -25,6 +25,7 @@ cd /tmp/images
 openstack image show {{ .name  | quote }} || \
   { curl -O {{ .source_url }}{{ .image_file }}; \
   openstack image create {{ .name | quote }} \
+  {{ if .id -}} --id {{ .id }} {{ end -}} \
   --min-disk {{ .min_disk }} \
   --disk-format {{ .image_type }} \
   --file {{ .image_file }} \

glance/values.yaml

@@ -64,6 +64,7 @@ bootstrap:
   enabled: true
   images:
     cirros:
+      id: null
       name: "Cirros 0.3.5 64-bit"
       source_url: "http://download.cirros-cloud.net/0.3.5/"
       image_file: "cirros-0.3.5-x86_64-disk.img"