Merge "Return instance ID of worker node"

magnum/drivers/k8s_coreos_v1/templates/kubeminion.yaml

@@ -524,7 +524,18 @@ outputs:
     description: >
       This is the "public" IP address of the Kubernetes minion node.
 
+  ######################################################################
+  #
+  # NOTE(flwang): Returning the minion node server ID here so that
+  # consumer can send API request to Heat to remove a particular
+  # node with removal_policies. Otherwise, the consumer (e.g. AutoScaler)
+  # has to use index to do the remove which is confusing out of the
+  # OpenStack world.
+  # https://storyboard.openstack.org/#!/story/2005054
+  #
+  ######################################################################
+
   OS::stack_id:
-    value: {get_param: "OS::stack_id"}
+    value: { get_resource: kube-minion }
     description: >
-      This is a id of the stack which creates from this template.
+      This is the Nova server id of the node.

magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml

@@ -543,7 +543,18 @@ outputs:
     description: >
       This is the "public" IP address of the Kubernetes minion node.
 
+  ######################################################################
+  #
+  # NOTE(flwang): Returning the minion node server ID here so that
+  # consumer can send API request to Heat to remove a particular
+  # node with removal_policies. Otherwise, the consumer (e.g. AutoScaler)
+  # has to use index to do the remove which is confusing out of the
+  # OpenStack world.
+  # https://storyboard.openstack.org/#!/story/2005054
+  #
+  ######################################################################
+
   OS::stack_id:
-    value: {get_param: "OS::stack_id"}
+    value: { get_resource: kube-minion }
     description: >
-      This is a id of the stack which creates from this template.
+      This is the Nova server id of the node.

magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion.yaml

@@ -108,7 +108,18 @@ outputs:
     description: >
       This is the "public" IP address of the Kubernetes minion node.
 
+  ######################################################################
+  #
+  # NOTE(flwang): Returning the minion node server ID here so that
+  # consumer can send API request to Heat to remove a particular
+  # node with removal_policies. Otherwise, the consumer (e.g. AutoScaler)
+  # has to use index to do the remove which is confusing out of the
+  # OpenStack world.
+  # https://storyboard.openstack.org/#!/story/2005054
+  #
+  ######################################################################
+
   OS::stack_id:
-    value: {get_param: "OS::stack_id"}
+    value: { get_resource: kube-minion }
     description: >
-      This is a id of the stack which creates from this template.
+      This is the Ironic server id of the node.

releasenotes/notes/return-server-id-in-kubeminion-cb33f5141e0b7fa9.yaml

@@ -0,0 +1,11 @@
+---
+fixes:
+  - |
+    Return instance ID of workder node in k8s minion template so that
+    consumer can send API request to Heat to remove a particular
+    node with removal_policies. Otherwise, the consumer (e.g. AutoScaler)
+    has to use index to do the remove which is confusing out of the
+    OpenStack world.
+    https://storyboard.openstack.org/#!/story/2005054
+
+