|
 |
356a11 |
From 84e1eb06f3434edc20d87d3d3b5d09c755eeee69 Mon Sep 17 00:00:00 2001
|
|
 |
356a11 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
 |
356a11 |
Date: Fri, 5 May 2017 18:51:49 +1000
|
|
 |
356a11 |
Subject: [PATCH] container: The location of the docker resource is the more
|
|
 |
356a11 |
interesting one
|
|
 |
356a11 |
|
|
 |
356a11 |
---
|
|
 |
356a11 |
lib/pengine/container.c | 6 +++---
|
|
 |
356a11 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
 |
356a11 |
|
|
 |
356a11 |
diff --git a/lib/pengine/container.c b/lib/pengine/container.c
|
|
 |
356a11 |
index 1280227..043f129 100644
|
|
 |
356a11 |
--- a/lib/pengine/container.c
|
|
 |
356a11 |
+++ b/lib/pengine/container.c
|
|
 |
356a11 |
@@ -883,9 +883,9 @@ tuple_print(container_grouping_t * tuple, const char *pre_text, long options, vo
|
|
 |
356a11 |
offset += snprintf(buffer + offset, LINE_MAX - offset, " (%s)", tuple->ipaddr);
|
|
 |
356a11 |
}
|
|
 |
356a11 |
|
|
 |
356a11 |
- if(tuple->remote && tuple->remote->running_on != NULL) {
|
|
 |
356a11 |
- node = tuple->remote->running_on->data;
|
|
 |
356a11 |
- } else if (tuple->remote == NULL && rsc->running_on != NULL) {
|
|
 |
356a11 |
+ if(tuple->docker && tuple->docker->running_on != NULL) {
|
|
 |
356a11 |
+ node = tuple->docker->running_on->data;
|
|
 |
356a11 |
+ } else if (tuple->docker == NULL && rsc->running_on != NULL) {
|
|
 |
356a11 |
node = rsc->running_on->data;
|
|
 |
356a11 |
}
|
|
 |
356a11 |
common_print(rsc, pre_text, buffer, node, options, print_data);
|
|
 |
356a11 |
--
|
|
 |
356a11 |
1.8.3.1
|
|
 |
356a11 |
|