openstack/openstack-helm
Code Issues Proposed changes

Add missing argument in overrides yaml

Browse Source 
This patch modifies two points:
1. Add OSH_EXTRA_HELM_ARGS in tempest script.
2. When running pike or ocata release with overrides,
   some docker image are missing.

Change-Id: I5fc7c059be009f4298a8dc2880a214137a65fc87
This commit is contained in:
chenlx 2018-07-11 10:23:44 +08:00
parent 3a48b149c5
commit 57096ee7e7
6 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deployment/multinode/900-tempest.sh
View File

@ -83,7 +83,9 @@ envsubst < /tmp/tempest.yaml
helm upgrade --install tempest ./tempest \
--namespace=openstack \
--values=/tmp/tempest.yaml
--values=/tmp/tempest.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_TEMPEST}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack 2400

1
tools/overrides/releases/newton/kolla.yaml
View File

@ -82,6 +82,7 @@ images:
senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:3.0.3'
senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:3.0.3'
senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3'
senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3'
tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
pod:

1
tools/overrides/releases/ocata/kolla.yaml
View File

@ -79,6 +79,7 @@ images:
senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:ocata'
senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:ocata'
senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata'
senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata'
tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
pod:

1
tools/overrides/releases/ocata/loci.yaml
View File

@ -77,5 +77,6 @@ images:
senlin_api: 'docker.io/openstackhelm/senlin:ocata'
senlin_db_sync: 'docker.io/openstackhelm/senlin:ocata'
senlin_engine: 'docker.io/openstackhelm/senlin:ocata'
senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:ocata'
tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'

2
tools/overrides/releases/pike/kolla.yaml
View File

@ -62,6 +62,7 @@ images:
neutron_server: 'docker.io/kolla/ubuntu-source-neutron-server:pike'
nova_api: 'docker.io/kolla/ubuntu-source-nova-api:pike'
nova_cell_setup: 'docker.io/kolla/ubuntu-source-nova-api:pike'
nova_cell_setup_init: 'docker.io/kolla/ubuntu-source-nova-api:pike'
nova_compute: 'docker.io/kolla/ubuntu-source-nova-compute:pike'
nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:pike'
nova_compute_ssh: 'docker.io/kolla/ubuntu-source-nova-ssh:pike'
@ -78,6 +79,7 @@ images:
senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:pike'
senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:pike'
senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:pike'
senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:pike'
tempest: 'docker.io/kolla/ubuntu-source-tempest:pike'
test: 'docker.io/kolla/ubuntu-source-rally:pike'
pod:

2
tools/overrides/releases/pike/loci.yaml
View File

@ -60,6 +60,7 @@ images:
neutron_sriov_agent_init: 'docker.io/openstackhelm/neutron:pike-sriov-1804'
nova_api: 'docker.io/openstackhelm/nova:pike'
nova_cell_setup: 'docker.io/openstackhelm/nova:pike'
nova_cell_setup_init: 'docker.io/openstackhelm/heat:pike'
nova_compute: 'docker.io/openstackhelm/nova:pike'
nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:pike'
nova_compute_ssh: 'docker.io/openstackhelm/nova:pike'
@ -76,5 +77,6 @@ images:
senlin_api: 'docker.io/openstackhelm/senlin:pike'
senlin_db_sync: 'docker.io/openstackhelm/senlin:pike'
senlin_engine: 'docker.io/openstackhelm/senlin:pike'
senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:pike'
tempest: 'docker.io/kolla/ubuntu-source-tempest:pike'
test: 'docker.io/kolla/ubuntu-source-rally:pike'