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/neutron-api.yaml | |
parent | 847a1fe79333f3eb18672a88a5212cbd395b94bf (diff) | |
parent | 51da97d04a2cbc81ad4b56a8a91c6dd43d5afe81 (diff) |
Merge "docker bootstrap service commands"
Diffstat (limited to 'docker/services/neutron-api.yaml')
-rw-r--r-- | docker/services/neutron-api.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 9517e4b1..7ce47a14 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -110,8 +110,6 @@ outputs: net: host privileged: false detach: false - # FIXME: we should make config file permissions right - # and run as neutron user user: root volumes: list_concat: @@ -120,7 +118,10 @@ outputs: - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro - /var/log/containers/neutron:/var/log/neutron - command: ['neutron-db-manage', 'upgrade', 'heads'] + command: ['/usr/bin/bootstrap_host_exec', 'neutron_api', 'neutron-db-manage', 'upgrade', 'heads'] + # FIXME: we should make config file permissions right + # and run as neutron user + #command: "/usr/bin/bootstrap_host_exec neutron_api su neutron -s /bin/bash -c 'neutron-db-manage upgrade heads'" step_4: map_merge: - neutron_api: |