diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-09-19 14:06:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 14:06:04 +0000 |
| commit | 16952e8c529bb666c9d793d63704f5a35ed630ea (patch) | |
| tree | 13c015385fb5c8fb42e58dd71e176a6a658b9d63 /deployment/heat/onap-oom/env/windriver | |
| parent | 8ef80a9402c1ab2cfb4e4c0f18b4b6ae7912dd3b (diff) | |
| parent | 91075e478fd172888f9335f55e8ef4df71e6c632 (diff) | |
Merge "Fix encrypted password location"
Diffstat (limited to 'deployment/heat/onap-oom/env/windriver')
| -rw-r--r-- | deployment/heat/onap-oom/env/windriver/onap-oom-light.env | 3 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/windriver/onap-oom.env | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env index 75c4f054c..5d18a4d34 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env @@ -20,7 +20,6 @@ parameters: robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "__public_net_id__" - openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "ubuntu-14-04-cloud-amd64" @@ -34,6 +33,8 @@ parameters: demoArtifactsVersion: "1.2.2" scriptVersion: "1.2.1" rancherIpAddress: "__rancher_ip_addr__" + config: + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env index 48cc977e1..80c1e7fee 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -19,7 +19,6 @@ parameters: robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "__public_net_id__" - openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "ubuntu-14-04-cloud-amd64" @@ -33,6 +32,8 @@ parameters: demoArtifactsVersion: "1.2.2" scriptVersion: "1.2.1" rancherIpAddress: "__rancher_ip_addr__" + config: + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" so: config: openStackUserName: "${OS_USERNAME}" |