From fb68ca551bfeeb0fbec01f8948d7e457dc1128ff Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Mon, 15 May 2017 15:10:47 -0500 Subject: [PATCH] Fix os__*_domain names in systemd service file 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. --- bin/install_openstackbmc.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/install_openstackbmc.sh b/bin/install_openstackbmc.sh index c706a7c..c5fb618 100644 --- a/bin/install_openstackbmc.sh +++ b/bin/install_openstackbmc.sh @@ -45,6 +45,8 @@ export OS_TENANT_NAME=$os_tenant export OS_PASSWORD=$os_password export OS_AUTH_URL=$os_auth_url 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_PROJECT_DOMAIN_ID=$os__project_domain # v3 env vars mess up v2 auth @@ -112,7 +114,7 @@ Requires=config-bmc-ips.service After=config-bmc-ips.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 User=root