From 2595a10764fc504d151aaeb6bc79c0348c6d4dc8 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Thu, 4 Jun 2015 10:41:07 +0800 Subject: [PATCH] Fix typos Change-Id: I5e35691c052950144f0653e185c7d3cba55713f0 --- playbooks/roles/bifrost-setup-nodes/README.md | 2 +- playbooks/roles/ironic-install/README.md | 2 +- playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/bifrost-setup-nodes/README.md b/playbooks/roles/bifrost-setup-nodes/README.md index 5efd51e59..9f8ed63d5 100644 --- a/playbooks/roles/bifrost-setup-nodes/README.md +++ b/playbooks/roles/bifrost-setup-nodes/README.md @@ -22,7 +22,7 @@ network_interface: This is the network interface that the nodes receive DHCP/PXE deploy_image_filename: This is the filename of the image to deploy, which is combined with the network_interface variable to generate a URL used to set the Ironic instance image_source. iThis variable does not have a default in this role and expects to receive this informa tion from the calling playbook. -deploy_image: This is the full path to the image to be deployed to the system. This is as Ironic requiers the MD5 hash of the file to be deployed for validation during the deployment process. As a result of this requirement, the hash is automatically collected and submitted to Ironic with the node deployment request. This variable does not have a default in this role and expects to receive this information from the calling playbook. +deploy_image: This is the full path to the image to be deployed to the system. This is as Ironic requires the MD5 hash of the file to be deployed for validation during the deployment process. As a result of this requirement, the hash is automatically collected and submitted to Ironic with the node deployment request. This variable does not have a default in this role and expects to receive this information from the calling playbook. Dependencies ------------ diff --git a/playbooks/roles/ironic-install/README.md b/playbooks/roles/ironic-install/README.md index a27f8267c..d6d3fbde7 100644 --- a/playbooks/roles/ironic-install/README.md +++ b/playbooks/roles/ironic-install/README.md @@ -29,7 +29,7 @@ The Ironic python client and shade libraries can be installed directly from GIT. ironicclient_source_install: false shade_source_install: false -The dib_env_vars are settings for the diskimage-builder environment variables which allow settings to be passed to elements that are being utilized to build a disk image. More information on diskimage-builder can be found at http://git.openstack.org/cgit/openstack/diskimage-builder/. Addtionally, an extra_dib_elements setting exists which is a space separated list of elements to incorporate into the image. +The dib_env_vars are settings for the diskimage-builder environment variables which allow settings to be passed to elements that are being utilized to build a disk image. More information on diskimage-builder can be found at http://git.openstack.org/cgit/openstack/diskimage-builder/. Additionally, an extra_dib_elements setting exists which is a space separated list of elements to incorporate into the image. dib_env_vars: DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive" diff --git a/playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 b/playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 index c3328f564..7f9ceeab2 100644 --- a/playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 +++ b/playbooks/roles/ironic-install/templates/dnsmasq.conf.j2 @@ -142,7 +142,7 @@ bind-interfaces # Set a different domain for a particular subnet #domain=wireless.thekelleys.org.uk,192.168.2.0/24 -# Same idea, but range rather then subnet +# Same idea, but range rather than subnet #domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200 # Uncomment this to enable the integrated DHCP server, you need