From b9b62138f6eaedfe892a7ed26e7f8be47e3b8227 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 4 Apr 2017 15:24:59 +0100
Subject: [PATCH] Add a BMC configuration file to consolidate IPMI credentials
 and BMC type

---
 ansible/group_vars/all/bifrost   |  4 ++--
 ansible/group_vars/all/bmc       | 15 +++++++++++++++
 ansible/group_vars/all/inspector |  4 ++--
 etc/kayobe/bmc.yml               | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 ansible/group_vars/all/bmc
 create mode 100644 etc/kayobe/bmc.yml

diff --git a/ansible/group_vars/all/bifrost b/ansible/group_vars/all/bifrost
index e6a57d571..5770f21b8 100644
--- a/ansible/group_vars/all/bifrost
+++ b/ansible/group_vars/all/bifrost
@@ -58,10 +58,10 @@ kolla_bifrost_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options
 kolla_bifrost_inspector_rules: "{{ inspector_rules }}"
 
 # Ironic inspector IPMI username to set.
-kolla_bifrost_inspector_ipmi_username: "{{ inspector_ipmi_username }}"
+kolla_bifrost_inspector_ipmi_username: "{{ ipmi_username }}"
 
 # Ironic inspector IPMI password to set.
-kolla_bifrost_inspector_ipmi_password: "{{ inspector_ipmi_password }}"
+kolla_bifrost_inspector_ipmi_password: "{{ ipmi_password }}"
 
 # Ironic inspector network interface name on which to check for an LLDP switch
 # port description to use as the node's name.
diff --git a/ansible/group_vars/all/bmc b/ansible/group_vars/all/bmc
new file mode 100644
index 000000000..5da5afb8b
--- /dev/null
+++ b/ansible/group_vars/all/bmc
@@ -0,0 +1,15 @@
+---
+###############################################################################
+# Configuration of Baseboard Management Controllers (BMCs).
+
+# Type of host's BMC. Currently only idrac is supported.
+bmc_type:
+
+# Address to use to access a host's BMC via IPMI.
+ipmi_address:
+
+# Username to use to access a host's BMC via IPMI.
+ipmi_username:
+
+# Password to use to access a host's BMC via IPMI.
+ipmi_password:
diff --git a/ansible/group_vars/all/inspector b/ansible/group_vars/all/inspector
index ceaba4dfe..1f23e034d 100644
--- a/ansible/group_vars/all/inspector
+++ b/ansible/group_vars/all/inspector
@@ -53,10 +53,10 @@ inspector_discovery_enroll_node_driver: "ipmi"
 # Ironic inspector configuration.
 
 # Ironic inspector IPMI username to set.
-inspector_ipmi_username:
+inspector_ipmi_username: "{{ ipmi_username }}"
 
 # Ironic inspector IPMI password to set.
-inspector_ipmi_password:
+inspector_ipmi_password: "{{ ipmi_password }}"
 
 # Ironic inspector network interface name on which to check for an LLDP switch
 # port description to use as the node's name.
diff --git a/etc/kayobe/bmc.yml b/etc/kayobe/bmc.yml
new file mode 100644
index 000000000..ea10df37f
--- /dev/null
+++ b/etc/kayobe/bmc.yml
@@ -0,0 +1,19 @@
+---
+###############################################################################
+# Configuration of Baseboard Management Controllers (BMCs).
+
+# Type of host's BMC. Currently only idrac is supported.
+#bmc_type:
+
+# Address to use to access a host's BMC via IPMI.
+#ipmi_address:
+
+# Username to use to access a host's BMC via IPMI.
+#ipmi_username:
+
+# Password to use to access a host's BMC via IPMI.
+#ipmi_password:
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes