Uplift all charts/images and fixes
Change-Id: I82c3bb2bbcf890df61c63359b1492ae349114a34
This commit is contained in:
parent
9de22e438f
commit
425bba963b
@ -297,10 +297,6 @@ data:
|
|||||||
</Proxy>
|
</Proxy>
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
config:
|
|
||||||
http:
|
|
||||||
max_content_length: 2gb
|
|
||||||
pipelining: false
|
|
||||||
env:
|
env:
|
||||||
java_opts:
|
java_opts:
|
||||||
client: "-Xms8g -Xmx8g"
|
client: "-Xms8g -Xmx8g"
|
||||||
|
@ -242,6 +242,11 @@ data:
|
|||||||
ceph_client:
|
ceph_client:
|
||||||
configmap: tenant-ceph-etc
|
configmap: tenant-ceph-etc
|
||||||
user_secret_name: pvc-tceph-client-key
|
user_secret_name: pvc-tceph-client-key
|
||||||
|
|
||||||
|
# disable bootstrap of Cirros image
|
||||||
|
bootstrap:
|
||||||
|
enabled: false
|
||||||
|
|
||||||
conf:
|
conf:
|
||||||
rally_tests:
|
rally_tests:
|
||||||
run_tempest: false
|
run_tempest: false
|
||||||
@ -270,6 +275,7 @@ data:
|
|||||||
sla:
|
sla:
|
||||||
failure_rate:
|
failure_rate:
|
||||||
max: 0
|
max: 0
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
loggers:
|
loggers:
|
||||||
keys:
|
keys:
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -38,11 +38,18 @@ tools/openstack stack create --wait \
|
|||||||
|
|
||||||
: ${OSH_VM_KEY_STACK:="heat-vm-key"}
|
: ${OSH_VM_KEY_STACK:="heat-vm-key"}
|
||||||
: ${OSH_PRIVATE_SUBNET:="10.0.0.0/24"}
|
: ${OSH_PRIVATE_SUBNET:="10.0.0.0/24"}
|
||||||
# NOTE(portdirect): We do this fancy, and seemingly pointless, footwork to get
|
|
||||||
# the full image name for the cirros Image without having to be explicit.
|
: ${OSH_CIRROS_IMAGE_URL:="https://download.cirros-cloud.net/0.3.5/"}
|
||||||
IMAGE_NAME=$(tools/openstack image show -f value -c name \
|
: ${OSH_CIRROS_IMAGE_NAME:="cirros-0.3.5-x86_64-disk.img"}
|
||||||
$(tools/openstack image list -f csv | awk -F ',' '{ print $2 "," $1 }' | \
|
|
||||||
grep "^\"Cirros" | head -1 | awk -F ',' '{ print $2 }' | tr -d '"'))
|
IMAGE_NAME="cirros-0.3.5-x86_64-test"
|
||||||
|
wget "${OSH_CIRROS_IMAGE_URL}/${OSH_CIRROS_IMAGE_NAME}"
|
||||||
|
|
||||||
|
tools/openstack image create --public \
|
||||||
|
--container-format bare \
|
||||||
|
--disk-format qcow2 \
|
||||||
|
--file /target/${OSH_CIRROS_IMAGE_NAME} \
|
||||||
|
$IMAGE_NAME
|
||||||
|
|
||||||
rm -rf ${OSH_VM_KEY_STACK}*
|
rm -rf ${OSH_VM_KEY_STACK}*
|
||||||
ssh-keygen -t rsa -N '' -f $OSH_VM_KEY_STACK
|
ssh-keygen -t rsa -N '' -f $OSH_VM_KEY_STACK
|
||||||
|
Loading…
Reference in New Issue
Block a user