瀏覽代碼

Merge "Update environment var for keystone bootstrap" into stable/stein

changes/25/691825/4
Zuul Gerrit Code Review 3 月之前
父節點
當前提交
61688872a7
共有 1 個文件被更改,包括 2 次插入6 次删除
  1. +2
    -6
      deployment/keystone/keystone-container-puppet.yaml

+ 2
- 6
deployment/keystone/keystone-container-puppet.yaml 查看文件

@@ -763,14 +763,10 @@ outputs:
start_order: 3
action: exec
user: root
# NOTE(mwhahaha): We use $$ because we're executing in python to
# call as shell script and passing the command to run as arguments
# to that shell script. So when it is called via eval, the escaped
# $ properly evaulates
command:
[ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', '$$KEYSTONE_BOOTSTRAP_PASSWORD' ]
[ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap' ]
environment:
KEYSTONE_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
OS_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
keystone_cron:
start_order: 4
image: *keystone_image


Loading…
取消
儲存