From 49cb3b2e052bda379d35c6141874a332e983fa8c Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 11 Jan 2018 14:55:23 +0200
Subject: [PATCH] Always pass the plan name to fernet workbook
It was using the default (overcloud) which is not necessarily the case
for every deployment.
This commit passes the TRIPLEO_PLAN_NAME environment file and derives
the value from the passed container name.
Change-Id: I2fc481336b945c88f8b6a017690773be3293a2b4
Closes-Bug: #1742655
---
workbooks/fernet-key-rotate.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/workbooks/fernet-key-rotate.yaml b/workbooks/fernet-key-rotate.yaml
index ee274e648..93c5e8946 100644
--- a/workbooks/fernet-key-rotate.yaml
+++ b/workbooks/fernet-key-rotate.yaml
@@ -57,7 +57,7 @@ workflows:
hosts: keystone
inventory: /usr/bin/tripleo-ansible-inventory
ssh_private_key: <% task(get_privkey).result %>
- extra_env_variables: <% $.ansible_extra_env_variables %>
+ extra_env_variables: <% $.ansible_extra_env_variables + dict(TRIPLEO_PLAN_NAME=>$.container) %>
verbosity: 0
remote_user: heat-admin
become: true