diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-05-02 16:19:04 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-05-02 22:16:46 -0700 |
| commit | 11c9874f6aa84e8f3ab03f9bec84c8b0c5033003 (patch) | |
| tree | eb84e76c21f0a51fad2c8534d5714de88599988b /deployment/heat/onap-oom/scripts | |
| parent | 14a6b3094ec9fc45d545e6beb6b2d4a9e7049238 (diff) | |
Pass integration-override directly in env file
Change-Id: I5fddab2211fcaa1edbc91662222801499c610cfb
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/scripts')
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 3 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index c4d9bf887..a28368212 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -12,6 +12,9 @@ ENV_FILE=$1 source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh +SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f +export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p) + for n in $(seq 1 5); do $WORKSPACE/test/ete/scripts/teardown-onap.sh diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index a63365837..922c7ccb6 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -7,6 +7,12 @@ if [ -z "$WORKSPACE" ]; then fi PARTS_DIR=$WORKSPACE/deployment/heat/onap-oom/parts +cat <<EOF +# +# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST +# +EOF + cat $PARTS_DIR/onap-oom-1.yaml cat <<EOF @@ -25,10 +31,12 @@ cat <<EOF template: get_file: rancher_vm_entrypoint.sh params: - __lab_name__: { get_param: lab_name } __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __integration_override_yaml__: { get_param: integration_override_yaml } + __oam_network_id__: { get_resource: oam_network } + __oam_subnet_id__: { get_resource: oam_subnet } __k8s_vm_ips__: [ EOF |