diff options
| author |   Bogdan Dobrelya <bdobreli@redhat.com> | 2017-03-22 12:10:24 +0100 |
|---|---|---|
| committer | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-03-24 09:28:30 +0100 |
| commit | 9aaa5ba03d92490fb5a0414b3d7c9a884bd6ff78 (patch) | |
| tree | 8d03589360597885f5bf8c75f95c70a3b8901255 /docker/services | |
| parent | 8716d9f769dd17ef17fef7f0fdefaf0df6a7fe24 (diff) | |
Rework container volumes as hostpath mounts
Also add upgrade_tasks to disable corresponding host
services in order to not data race with containers
Change-Id: I19c16aaa3e5a73436ca7aa7d06facf64feee2327
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/database/mongodb.yaml | 4 | ||||
| -rw-r--r-- | docker/services/nova-compute.yaml | 4 | ||||
| -rw-r--r-- | docker/services/nova-ironic.yaml | 6 | ||||
| -rw-r--r-- | docker/services/nova-libvirt.yaml | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index 265558a4..15795828 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -102,8 +102,8 @@ outputs: step_config: 'include ::tripleo::profile::base::database::mongodb' config_image: *mongodb_image volumes: - - "mongodb:/var/lib/mongodb/" - - "logs:/var/log/kolla:ro" + - /var/lib/mongodb:/var/lib/mongodb + - logs:/var/log/kolla:ro host_prep_tasks: - name: create /var/lib/mongodb file: diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 0afd3e70..957eed7f 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -91,3 +91,7 @@ outputs: file: path: /var/lib/libvirt state: directory + upgrade_tasks: + - name: Stop and disable nova-compute service + tags: step2 + service: name=nova-compute state=stopped enabled=no diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 170468a5..3d849f59 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -85,6 +85,10 @@ outputs: - /run:/run - /dev:/dev - /etc/iscsi:/etc/iscsi - - nova_compute:/var/lib/nova/ + - /var/lib/nova/:/var/lib/nova environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + upgrade_tasks: + - name: Stop and disable nova-compute service + tags: step2 + service: name=nova-compute state=stopped enabled=no diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index a0437162..480bb80e 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -100,3 +100,7 @@ outputs: with_items: - /etc/libvirt/qemu - /var/lib/libvirt + upgrade_tasks: + - name: Stop and disable libvirtd service + tags: step2 + service: name=libvirtd state=stopped enabled=no |