From de9c1d89bb0fa61c90cdb77293f884581246023f Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 13 Oct 2014 15:28:35 +0200 Subject: [PATCH] Move last changes from PR #32 to ironic-discoverd element --- .../undercloud-stack-config/config.json.template | 5 +++++ .../install.d/02-undercloud-stack-heat-metadata | 3 +++ instack.answers.sample | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/elements/undercloud-stack-config/config.json.template b/elements/undercloud-stack-config/config.json.template index f5d41ac21..f8e7903b0 100644 --- a/elements/undercloud-stack-config/config.json.template +++ b/elements/undercloud-stack-config/config.json.template @@ -143,5 +143,10 @@ "stonith_enabled": "false", "recheck_interval": "5", "quorum_policy": "ignore" + }, + "discovery": { + "interface": "{{DISCOVERY_INTERFACE}}", + "iprange": "{{DISCOVERY_IPRANGE}}", + "pxeip": "{{DISCOVERY_PXEIP}}" } } diff --git a/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata b/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata index cb54bf782..8bc8f57f6 100755 --- a/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata +++ b/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata @@ -50,6 +50,9 @@ context = { 'DHCP_END': os.environ.get('DHCP_END', '192.0.2.24'), 'NETWORK_CIDR': os.environ.get('NETWORK_CIDR', '192.0.2.0/24'), 'NETWORK_GATEWAY': os.environ.get('NETWORK_GATEWAY', '192.0.2.1'), + 'DISCOVERY_INTERFACE': os.environ.get('DISCOVERY_INTERFACE', 'br-ctlplane'), + 'DISCOVERY_IPRANGE': os.environ.get('DISCOVERY_IPRANGE', '192.0.2.100,192.0.2.120'), + 'DISCOVERY_PXEIP': os.environ.get('DISCOVERY_PXEIP', '192.0.2.1'), 'UNDERCLOUD_DB_PASSWORD': os.environ.get('UNDERCLOUD_DB_PASSWORD', 'unset'), 'UNDERCLOUD_ADMIN_TOKEN': os.environ.get('UNDERCLOUD_ADMIN_TOKEN', 'unset'), 'UNDERCLOUD_ADMIN_PASSWORD': os.environ.get('UNDERCLOUD_ADMIN_PASSWORD', 'unset'), diff --git a/instack.answers.sample b/instack.answers.sample index 26d4e16f1..baf1fc53c 100644 --- a/instack.answers.sample +++ b/instack.answers.sample @@ -45,6 +45,20 @@ NETWORK_CIDR=192.0.2.0/24 # Network gateway for neturon managed network for Overcloud instances NETWORK_GATEWAY=192.0.2.1 +### DISCOVERY_INTERFACE ### +# Network interface on which discovery dnsmasq will listen +# If in doubt, do not change +DISCOVERY_INTERFACE=br-ctlplane + +### DISCOVERY_IPRANGE ### +# Temporary IP range that will be given to nodes during discovery process +# Should not overlap with Neutron range, but should be in the same network +DISCOVERY_IPRANGE=192.0.2.100,192.0.2.120 + +### DISCOVERY_PXEIP ### +# IP address of TFTP server for discovery, chances are high that it is LOCAL_IP +DISCOVERY_PXEIP=192.0.2.1 + ### Database password ### # Password used for MySQL databases # If left unset, one will be automatically generated