From 5071d16ceae42338ab92da28178a6b6c5eb55329 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 5 Aug 2019 14:05:40 -0600 Subject: [PATCH] Configure minion hostname We should set the minion_hostname in the minion.conf similar to what we do for the undercloud. Change-Id: Iacd6e9860b7aabff65b6c2d383d488903a9a0287 Closes-Bug: #1839025 --- playbooks/multinode-undercloud-minion.yml | 5 ----- roles/undercloud-minion-deploy/defaults/main.yml | 1 + roles/undercloud-minion-deploy/templates/minion.conf.j2 | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/playbooks/multinode-undercloud-minion.yml b/playbooks/multinode-undercloud-minion.yml index 22adc239b..8392df473 100644 --- a/playbooks/multinode-undercloud-minion.yml +++ b/playbooks/multinode-undercloud-minion.yml @@ -48,11 +48,6 @@ shell: "{{ ansible_pkg_mgr }} --enablerepo='gating-repo' update -y" become: true when: hostvars['undercloud']['compressed_gating_repo'] is defined - - name: Include hostname tasks - include_role: - name: undercloud-setup - tasks_from: hostname - when: hostname_correction|default(false)|bool or step_set_undercloud_hostname|default(false)|bool tags: - undercloud-setup diff --git a/roles/undercloud-minion-deploy/defaults/main.yml b/roles/undercloud-minion-deploy/defaults/main.yml index 3f8735027..1056713b5 100644 --- a/roles/undercloud-minion-deploy/defaults/main.yml +++ b/roles/undercloud-minion-deploy/defaults/main.yml @@ -5,6 +5,7 @@ minion_install_cmd: openstack undercloud minion install minion_install_cli_options: "" minion_post_install_script: minion-install-post.sh.j2 minion_install_log: "{{ working_dir }}/minion_install.log" +minion_minion_hostname: minion.localdomain minion_install_script: minion-install.sh.j2 diff --git a/roles/undercloud-minion-deploy/templates/minion.conf.j2 b/roles/undercloud-minion-deploy/templates/minion.conf.j2 index 5366728fe..4e325e340 100644 --- a/roles/undercloud-minion-deploy/templates/minion.conf.j2 +++ b/roles/undercloud-minion-deploy/templates/minion.conf.j2 @@ -102,6 +102,7 @@ minion_enable_selinux = {{ minion_selinux_enabled }} # appropriately. If set, the undercloud install will configure all # system hostname settings. (string value) #minion_hostname = +minion_hostname = {{ minion_minion_hostname }} # Network interface on the Undercloud that will be handling the PXE # boots and DHCP for Overcloud instances. (string value)