From eba6c8fe109556d2c48872114e9daaafb38e9147 Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Thu, 16 Aug 2018 10:19:53 -0400 Subject: [PATCH] Add enabled_deploy_interfaces variable This allows the user to set enabled_deploy_interfaces in the ironic config file. Change-Id: I7cf25b7d7a306eab0d6b676f74d62fb08ca6ec01 --- playbooks/roles/bifrost-ironic-install/README.md | 3 ++- playbooks/roles/bifrost-ironic-install/defaults/main.yml | 1 + .../roles/bifrost-ironic-install/templates/ironic.conf.j2 | 1 + .../notes/enabled-deploy-interfaces-bf1e25a29ac80680.yaml | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/enabled-deploy-interfaces-bf1e25a29ac80680.yaml diff --git a/playbooks/roles/bifrost-ironic-install/README.md b/playbooks/roles/bifrost-ironic-install/README.md index 17ea5204c..455a4aeb9 100644 --- a/playbooks/roles/bifrost-ironic-install/README.md +++ b/playbooks/roles/bifrost-ironic-install/README.md @@ -88,7 +88,8 @@ Hardware types can be enabled using the "enabled_hardware_types" variable, which defaults to "ipmi, ilo, cisco-ucs-managed, cisco-ucs-standalone". Enabled interfaces can be set via the "enabled_boot_interfaces", -"enabled_management_interfaces", and "enabled_power_interfaces" variables. +"enabled_deploy_interfaces", "enabled_management_interfaces", and +"enabled_power_interfaces" variables. In the event of an external DHCP server being used, the user will need to configure their DHCP server such that PXE, and iPXE chain loading occurs. diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index a99eda5c3..a78b86db7 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -96,6 +96,7 @@ default_deploy_interface: "direct" enabled_boot_interfaces: "ilo-virtual-media,pxe" enabled_management_interfaces: "ilo,ipmitool,ucsm" enabled_power_interfaces: "ilo,ipmitool,ucsm" +enabled_deploy_interfaces: "iscsi,direct" # DHCP pool for requests -- ignored if inventory_dhcp is set to True # since IP allocation will be static. diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 index cd8d326e7..4313b1f5e 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 @@ -18,6 +18,7 @@ default_inspect_interface = inspector enabled_boot_interfaces = {{ enabled_boot_interfaces }} enabled_management_interfaces = {{ enabled_management_interfaces }} enabled_power_interfaces = {{ enabled_power_interfaces }} +enabled_deploy_interfaces = {{ enabled_deploy_interfaces }} enabled_hardware_types = {{ enabled_hardware_types }} diff --git a/releasenotes/notes/enabled-deploy-interfaces-bf1e25a29ac80680.yaml b/releasenotes/notes/enabled-deploy-interfaces-bf1e25a29ac80680.yaml new file mode 100644 index 000000000..49f690ca1 --- /dev/null +++ b/releasenotes/notes/enabled-deploy-interfaces-bf1e25a29ac80680.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds a new variable ``enabled_deploy_interfaces`` which allows the user + to set the ``enabled_deploy_interfaces`` configuration option in ironic.