aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-09 08:01:06 +0000
committerGerrit Code Review <review@openstack.org>2017-11-09 08:01:06 +0000
commit69545a0067dd8687c4991dc4d2717cab428c486d (patch)
tree1c4ca27cea91237c2bfc128532d6d95b8fae71aa
parent697ffad70d35ffeab939819a5b06d3ee0c1b1d67 (diff)
parent4d5686b6ad85d52c8359885bc8fc74cb525f6f76 (diff)
Merge "Set ipc=host for services attaching encrypted volumes" into stable/pike
-rw-r--r--docker/services/cinder-volume.yaml1
-rw-r--r--docker/services/nova-compute.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index d8a93b1..46873ea 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 883f438..5163a38 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