From 6d3c5d685938d76b93442ef5bfae8867b14faf8a Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 6 Oct 2014 14:34:07 +0200 Subject: [PATCH] Move default PXE configuration to ironic-discoverd --- .../ironic-discoverd/install.d/60-ironic-discoverd | 1 + .../os-apply-config/tftpboot/pxelinux.cfg/default | 7 +++++++ scripts/instack-prepare-discovery | 11 ----------- 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 elements/ironic-discoverd/os-apply-config/tftpboot/pxelinux.cfg/default diff --git a/elements/ironic-discoverd/install.d/60-ironic-discoverd b/elements/ironic-discoverd/install.d/60-ironic-discoverd index 7933f8074..4e52cefd7 100755 --- a/elements/ironic-discoverd/install.d/60-ironic-discoverd +++ b/elements/ironic-discoverd/install.d/60-ironic-discoverd @@ -5,6 +5,7 @@ set -eux pip install ironic-discoverd os-svc-daemon -n ironic-discoverd -i /usr -u root -c ironic-discoverd /etc/ironic-discoverd/discoverd.conf install -d -m 0750 -o root -g root /etc/ironic-discoverd +install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg # Enable the service os-svc-enable -n ironic-discoverd diff --git a/elements/ironic-discoverd/os-apply-config/tftpboot/pxelinux.cfg/default b/elements/ironic-discoverd/os-apply-config/tftpboot/pxelinux.cfg/default new file mode 100644 index 000000000..2093566fc --- /dev/null +++ b/elements/ironic-discoverd/os-apply-config/tftpboot/pxelinux.cfg/default @@ -0,0 +1,7 @@ +default discover + +label discover +kernel discovery.kernel +append initrd=discovery.ramdisk ironic_callback_url=http://{{local-ipv4}}:5050/v1/continue +ipappend 3 + diff --git a/scripts/instack-prepare-discovery b/scripts/instack-prepare-discovery index 6139ede3d..1a8994dfc 100755 --- a/scripts/instack-prepare-discovery +++ b/scripts/instack-prepare-discovery @@ -24,14 +24,3 @@ mkdir -p "$TFTP_ROOT" glance image-download --file "$TFTP_ROOT/discovery.kernel" discovery-kernel glance image-download --file "$TFTP_ROOT/discovery.ramdisk" discovery-ramdisk - -mkdir -p "$TFTP_ROOT/pxelinux.cfg" - -cat > "$TFTP_ROOT/pxelinux.cfg/default" <