openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix stackrc for containerized undercloud"

Browse Source
This commit is contained in:
Jenkins 2017-09-27 19:45:46 +00:00 committed by Gerrit Code Review
commit 30ffd14b21
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extraconfig/post_deploy/undercloud_post.sh
View File

@ -13,7 +13,7 @@ export OS_AUTH_TYPE=password
export OS_PASSWORD=$admin_password export OS_PASSWORD=$admin_password
export OS_AUTH_URL=$auth_url export OS_AUTH_URL=$auth_url
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_TENANT_NAME=admin export OS_PROJECT_NAME=admin
export COMPUTE_API_VERSION=1.1 export COMPUTE_API_VERSION=1.1
export NOVA_VERSION=1.1 export NOVA_VERSION=1.1
export OS_NO_CACHE=True export OS_NO_CACHE=True

4
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -85,9 +85,9 @@ resources:
scheme: http scheme: http
host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]} host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
port: 5000 port: 5000
path: /v2.0 path: /
- make_url: - make_url:
scheme: https scheme: https
host: {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]} host: {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
port: 13000 port: 13000
path: /v2.0 path: /