openstack/openstack-virtual-baremetal
Code Issues Proposed changes

Fix os__*_domain names in systemd service file

Browse Source 
These names were missed when I switched to the double _ version of
the variables to eliminate the collision with the non-domain names.

A comment is also added above the variables definitions to make it
clear that the double _ is intentional and not a typo.
This commit is contained in:
Ben Nemec 2017-05-15 15:10:47 -05:00
parent f1cf603404
commit fb68ca551b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/install_openstackbmc.sh
View File

@ -45,6 +45,8 @@ export OS_TENANT_NAME=$os_tenant
export OS_PASSWORD=$os_password export OS_PASSWORD=$os_password
export OS_AUTH_URL=$os_auth_url export OS_AUTH_URL=$os_auth_url
export OS_PROJECT_NAME=$os_project export OS_PROJECT_NAME=$os_project
# NOTE(bnemec): The double _ in these names is intentional. It prevents
# collisions with the $os_user and $os_project values above.
export OS_USER_DOMAIN_ID=$os__user_domain export OS_USER_DOMAIN_ID=$os__user_domain
export OS_PROJECT_DOMAIN_ID=$os__project_domain export OS_PROJECT_DOMAIN_ID=$os__project_domain
# v3 env vars mess up v2 auth # v3 env vars mess up v2 auth
@ -112,7 +114,7 @@ Requires=config-bmc-ips.service
After=config-bmc-ips.service After=config-bmc-ips.service
[Service] [Service]
ExecStart=/usr/local/bin/openstackbmc --os-user $os_user --os-password $os_password --os-tenant "$os_tenant" --os-auth-url $os_auth_url --os-project "$os_project" --os-user-domain "$os_user_domain" --os-project-domain "$os_project_domain" --instance $bm_instance --address $bmc_ip $cache_status ExecStart=/usr/local/bin/openstackbmc --os-user $os_user --os-password $os_password --os-tenant "$os_tenant" --os-auth-url $os_auth_url --os-project "$os_project" --os-user-domain "$os__user_domain" --os-project-domain "$os__project_domain" --instance $bm_instance --address $bmc_ip $cache_status
Restart=always Restart=always
User=root User=root