diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-09 08:01:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-09 08:01:06 +0000 |
| commit | 69545a0067dd8687c4991dc4d2717cab428c486d (patch) | |
| tree | 1c4ca27cea91237c2bfc128532d6d95b8fae71aa /docker/services | |
| parent | 697ffad70d35ffeab939819a5b06d3ee0c1b1d67 (diff) | |
| parent | 4d5686b6ad85d52c8359885bc8fc74cb525f6f76 (diff) | |
Merge "Set ipc=host for services attaching encrypted volumes" into stable/pike
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/cinder-volume.yaml | 1 | ||||
| -rw-r--r-- | docker/services/nova-compute.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index d8a93b13..46873ea8 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -125,6 +125,7 @@ outputs: step_4: cinder_volume: image: *cinder_volume_image + ipc: host net: host privileged: true restart: always diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 883f438b..5163a381 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -115,6 +115,7 @@ outputs: step_4: nova_compute: image: &nova_compute_image {get_param: DockerNovaComputeImage} + ipc: host net: host privileged: true user: nova |