From 936722f01ce0673a2b78ab5a7f27244eb98f92a7 Mon Sep 17 00:00:00 2001
From: "Dave Walker (Daviey)" <email@daviey.com>
Date: Mon, 13 Mar 2017 09:07:06 +0000
Subject: [PATCH] Remove heka_socket vol and unwedge some containers
The presence of heka_socket:/var/lib/kolla/heka with
containers that log to /dev/log, such as nova-ssh cause a
wedge on starting as /var/lib/kolla/heka/log is never
created due to the removal of heka.
This means that ssh data, such as config and keys are never
sync'd and sshd is never started.
Change-Id: Ia561526e6caf82eebd18c6e31cbeb1738b9ff602
Closes-Bug: #1672207
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
---
ansible/roles/nova/defaults/main.yml | 1 -
ansible/roles/swift/tasks/start.yml | 2 --
2 files changed, 3 deletions(-)
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index c28525e9b7..d2edb81c5e 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -32,7 +32,6 @@ nova_services:
- "kolla_logs:/var/log/kolla"
- "nova_compute:/var/lib/nova"
- "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
- - "heka_socket:/var/lib/kolla/heka/"
placement-api:
container_name: "placement_api"
group: "placement-api"
diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml
index b83b8c962d..442c3a7515 100644
--- a/ansible/roles/swift/tasks/start.yml
+++ b/ansible/roles/swift/tasks/start.yml
@@ -160,7 +160,6 @@
- "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro"
- "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}"
- "/etc/localtime:/etc/localtime:ro"
- - "heka_socket:/var/lib/kolla/heka/"
when: inventory_hostname in groups['swift-object-server']
- name: Starting swift-object-auditor container
@@ -174,7 +173,6 @@
- "{{ node_config_directory }}/swift-object-auditor/:{{ container_config_directory }}/:ro"
- "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}"
- "/etc/localtime:/etc/localtime:ro"
- - "heka_socket:/var/lib/kolla/heka/"
when: inventory_hostname in groups['swift-object-server']
- name: Starting swift-object-replicator container