diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-30 13:52:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-30 13:52:28 +0000 |
| commit | 5f374b863d66256d222c638a927c8455a9d10fc8 (patch) | |
| tree | 68c654312d03d29352c0a8c2420e160bed40ebbd /docker/services/keystone.yaml | |
| parent | 847a1fe79333f3eb18672a88a5212cbd395b94bf (diff) | |
| parent | 51da97d04a2cbc81ad4b56a8a91c6dd43d5afe81 (diff) | |
Merge "docker bootstrap service commands"
Diffstat (limited to 'docker/services/keystone.yaml')
| -rw-r--r-- | docker/services/keystone.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index ca643749..772859ee 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -131,8 +131,9 @@ outputs: environment: - KOLLA_BOOTSTRAP=True - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + command: ['/usr/bin/bootstrap_host_exec', 'keystone', '/usr/local/bin/kolla_start'] keystone: - start_order: 1 + start_order: 2 image: *keystone_image net: host privileged: false @@ -141,10 +142,10 @@ outputs: environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS keystone_bootstrap: - start_order: 2 + start_order: 3 action: exec command: - [ 'keystone', 'keystone-manage', 'bootstrap', '--bootstrap-password', {get_param: AdminPassword} ] + [ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', {get_param: AdminPassword} ] docker_puppet_tasks: # Keystone endpoint creation occurs only on single node step_3: |