From 50cf161bf98158a42a1a0aa114ca577e4e6a7dda Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 26 Nov 2018 10:39:16 +0000 Subject: [PATCH] Pass node and volume name prefixes to tenks_update_state node_name_prefix (default tk0) can be used to set a custom prefix for the node names. vol_name_prefix (default vol) can be used to set a custom prefix for the volume names. Support already existed for these in the action plugin, but the variables were not passed through. Change-Id: If968707285f9a8450bf16ca7a4956de6164986de TrivialFix --- ansible/action_plugins/tenks_update_state.py | 2 +- ansible/schedule.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/action_plugins/tenks_update_state.py b/ansible/action_plugins/tenks_update_state.py index 1846664..4dd82ab 100644 --- a/ansible/action_plugins/tenks_update_state.py +++ b/ansible/action_plugins/tenks_update_state.py @@ -34,7 +34,7 @@ class ActionModule(ActionBase): * Generating indices for physical networks for each hypervisor. * Scheduling specifications of nodes by type onto hypervisors. - The following task vars are accepted: + The following task arguments are accepted: :hypervisor_vars: A dict of hostvars for each hypervisor, keyed by hypervisor hostname. Required. :specs: A list of node specifications to be instantiated. Required. diff --git a/ansible/schedule.yml b/ansible/schedule.yml index 9507e19..2ec92b3 100644 --- a/ansible/schedule.yml +++ b/ansible/schedule.yml @@ -35,9 +35,11 @@ - name: Get updated state tenks_update_state: hypervisor_vars: "{{ hypervisor_vars }}" + node_name_prefix: "{{ node_name_prefix | default(omit) }}" node_types: "{{ node_types }}" specs: "{{ specs }}" state: "{{ current_state | default(omit) }}" + vol_name_prefix: "{{ vol_name_prefix | default(omit) }}" register: new_state - name: Write new state to file