From d4dc4b0cff4bca83466619b196156904ac596fc7 Mon Sep 17 00:00:00 2001 From: Mitsuhiro SHIGEMATSU Date: Sun, 7 Jun 2015 12:27:29 +0900 Subject: [PATCH] Correct mistakes in license notices Correcting mistakes in some license notices, this patch will fix some typos at the same time. Change-Id: Id363939a632f54669af9bd51b15a8ffeab2990be --- playbooks/roles/bifrost-configdrives/README.md | 12 ++++++------ playbooks/roles/bifrost-create-vm-nodes/README.md | 2 +- playbooks/roles/bifrost-prepare-for-test/README.md | 2 +- playbooks/roles/bifrost-setup-nodes/README.md | 4 ++-- playbooks/roles/bifrost-test-vm/README.md | 2 +- playbooks/roles/bifrost-unprovision-nodes/README.md | 4 ++-- .../roles/bifrost-validate-host-for-deploy/README.md | 4 ++-- playbooks/roles/ironic-delete/README.md | 6 +++--- playbooks/roles/ironic-enroll/README.md | 6 +++--- playbooks/roles/ironic-install/README.md | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/playbooks/roles/bifrost-configdrives/README.md b/playbooks/roles/bifrost-configdrives/README.md index 9cdfb0e2c..488747e79 100644 --- a/playbooks/roles/bifrost-configdrives/README.md +++ b/playbooks/roles/bifrost-configdrives/README.md @@ -15,19 +15,19 @@ This role, like the other deployment related bifrost playbooks are intended to b Additional key variables are: -ipv4_subnet_mask: This is the subnet mask(e.g. 255.255.255.0 or similar) that matches the static addressing which desires to be imprinted into the configuraiton drive. -ipv4_gateway: This is the IPv4 defaut router address with-in the IPv4 subnet being utilized for IP addresses for the nodes being deployed. +ipv4_subnet_mask: This is the subnet mask(e.g. 255.255.255.0 or similar) that matches the static addressing which desires to be imprinted into the configuration drive. +ipv4_gateway: This is the IPv4 default router address with-in the IPv4 subnet being utilized for IP addresses for the nodes being deployed. node_default_network_interface: This is the default network interface with-in the nodes to be deployed which the new IP configuration will be applied to. Note: This is likely to be deprecated and removed in the future as Bifrost will likely change methods utilized to include networking configuration into the configuration drive sufficiently that this should no longer be required. ipv4_nameserver: Defines the IPv4 Nameserver to configure the node with initially in order to support name resolution. -ssh_public_key_path: Defines the path to the file to be SSH public key to be inserted into the configuraiton drive. +ssh_public_key_path: Defines the path to the file to be SSH public key to be inserted into the configuration drive. ssh_public_key: If a user wishes to define an SSH public key as a string, this variable can be utilized which overrides ssh_public_key_path. Customizing ----------- -The attempt with this playbook is to create a very simple and easilly modifable configuraiton drive to be loaded to the remote machine. This is naturally done each time the role is executed for every node defined in the baremetal_csv_file. If one wishes to insert additional files, this can be done by editing the tasks/main.yml file. As the drives are generated in a stepwise fashion, it is important to make note of and use the "{{item.split(',')[9]}}" variable as that is utilized to deliniate the file destinations between different configuration drives. +The attempt with this playbook is to create a very simple and easily modifiable configuration drive to be loaded to the remote machine. This is naturally done each time the role is executed for every node defined in the baremetal_csv_file. If one wishes to insert additional files, this can be done by editing the tasks/main.yml file. As the drives are generated in a stepwise fashion, it is important to make note of and use the "{{item.split(',')[9]}}" variable as that is utilized to delineate the file destinations between different configuration drives. -Additional detail on the format of configuraiton drives can be found at http://docs.openstack.org/user-guide/content/enable_config_drive.html. +Additional detail on the format of configuration drives can be found at http://docs.openstack.org/user-guide/content/enable_config_drive.html. If one wishes to manually modify a configuration drive after the fact, the files are base64 encoded, gzip compressed, ISO9660 filesystems. Ironic will fail the deployment of the configuration drive if the file is not first found to be base64 encoded, and then gzip compressed. Alternatively, the configuration drive can be a vfat filesystem, although this carries with it some risks if the filesystem is always treated as a source of truth upon system boot. @@ -60,7 +60,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/bifrost-create-vm-nodes/README.md b/playbooks/roles/bifrost-create-vm-nodes/README.md index 913af4f53..785ee432b 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/README.md +++ b/playbooks/roles/bifrost-create-vm-nodes/README.md @@ -46,7 +46,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/bifrost-prepare-for-test/README.md b/playbooks/roles/bifrost-prepare-for-test/README.md index 0f91ac59a..ef77e9108 100644 --- a/playbooks/roles/bifrost-prepare-for-test/README.md +++ b/playbooks/roles/bifrost-prepare-for-test/README.md @@ -46,7 +46,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/bifrost-setup-nodes/README.md b/playbooks/roles/bifrost-setup-nodes/README.md index 9f8ed63d5..14650e460 100644 --- a/playbooks/roles/bifrost-setup-nodes/README.md +++ b/playbooks/roles/bifrost-setup-nodes/README.md @@ -19,7 +19,7 @@ ironic_url: This is the URL to the ironic server. By default, this is set to "h network_interface: This is the network interface that the nodes receive DHCP/PXE/iPXE. This is utilized to generate the url that Ironic is configured with for image retrieval. This variable does not have a default in this role and expects to receive this information from the calling playbook. -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 +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. This 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 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. @@ -52,7 +52,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/bifrost-test-vm/README.md b/playbooks/roles/bifrost-test-vm/README.md index e01034644..97a80ae55 100644 --- a/playbooks/roles/bifrost-test-vm/README.md +++ b/playbooks/roles/bifrost-test-vm/README.md @@ -42,7 +42,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/bifrost-unprovision-nodes/README.md b/playbooks/roles/bifrost-unprovision-nodes/README.md index 95f3e95ca..e43c4c412 100644 --- a/playbooks/roles/bifrost-unprovision-nodes/README.md +++ b/playbooks/roles/bifrost-unprovision-nodes/README.md @@ -14,7 +14,7 @@ The os_ironic_node module is required. Role Variables -------------- -baremetal_csv_file: This is the path to the CSV file which is enumarated through for nodes to be acted upon. +baremetal_csv_file: This is the path to the CSV file which is enumerated through for nodes to be acted upon. ironic_url: The setting defining the URL to the Ironic API. Presently defaulted to: "http://localhost:6385/" @@ -47,7 +47,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/bifrost-validate-host-for-deploy/README.md b/playbooks/roles/bifrost-validate-host-for-deploy/README.md index 1b0c7a74c..38cbb4eda 100644 --- a/playbooks/roles/bifrost-validate-host-for-deploy/README.md +++ b/playbooks/roles/bifrost-validate-host-for-deploy/README.md @@ -6,7 +6,7 @@ Preforms basic sanity checks of an Ironic node as part of Bifrost host before no Requirements ------------ -This role performs basic validation of an Ironic instalation resulting from the execution of the ironic-install role. As such, that role is required to have been previously executed, however is not required to be executed as part of the same playbook. +This role performs basic validation of an Ironic installation resulting from the execution of the ironic-install role. As such, that role is required to have been previously executed, however is not required to be executed as part of the same playbook. Role Variables -------------- @@ -49,7 +49,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/ironic-delete/README.md b/playbooks/roles/ironic-delete/README.md index 02068ebc7..e1a3a18e4 100644 --- a/playbooks/roles/ironic-delete/README.md +++ b/playbooks/roles/ironic-delete/README.md @@ -11,14 +11,14 @@ This role expects an environment installed with ironic-install role, although th Role Variables -------------- -baremetal_csv_file: This is the CSV file of nodes that is enumarted through for operations. +baremetal_csv_file: This is the CSV file of nodes that is enumerated through for operations. ironic_url: This is the url for the ironic server to connect to. It is presently defaulted to "http://localhost:6385/". Dependencies ------------ -This role has no direct role depenedencies although is expected to be executed as part of Bifrost's test sequence. +This role has no direct role dependencies although is expected to be executed as part of Bifrost's test sequence. Example Playbook ---------------- @@ -44,7 +44,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/ironic-enroll/README.md b/playbooks/roles/ironic-enroll/README.md index 7cd00d6e8..b5524b9c8 100644 --- a/playbooks/roles/ironic-enroll/README.md +++ b/playbooks/roles/ironic-enroll/README.md @@ -11,7 +11,7 @@ This role is dependent upon the os-ironic ansible module, which is dependent upo Role Variables -------------- -baremetal_csv_file: This variable is the path to a CSV file which contains a list of nodes to enroll into Ironic. This file has a particular format based on columns, which will be listed below, however the base playbooks are easilly modifiable to utilize less information as some of the information is not presently required. +baremetal_csv_file: This variable is the path to a CSV file which contains a list of nodes to enroll into Ironic. This file has a particular format based on columns, which will be listed below, however the base playbooks are easily modifiable to utilize less information as some of the information is not presently required. The CSV file has the following columns: @@ -34,7 +34,7 @@ The CSV file has the following columns: testing: This setting coupled with the previously mentioned baremetal_csv_file enrolls all nodes defined in the baremetal.csv file utilizing the Ironic agent_ssh driver instead of the agent_ipmitool driver which Bifrost uses by default. The default setting for this role is false. -ipmi_bridging: The setting is by default undefined, and is utilized when access to a host's IPMI interface is bridged, such as a cartrige or blade in a chassis that has a single management address. It has two options when defined, "single" or "dual", and is utilized to execute the appropriate task in order to feed the appropriate IPMI bridging information based on the CSV file into Ironic. +ipmi_bridging: The setting is by default undefined, and is utilized when access to a host's IPMI interface is bridged, such as a cartridge or blade in a chassis that has a single management address. It has two options when defined, "single" or "dual", and is utilized to execute the appropriate task in order to feed the appropriate IPMI bridging information based on the CSV file into Ironic. ironic_url: The setting defining the URL to the Ironic API. Presently defaulted to: "http://localhost:6385/" @@ -69,7 +69,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/playbooks/roles/ironic-install/README.md b/playbooks/roles/ironic-install/README.md index d6d3fbde7..b71671f99 100644 --- a/playbooks/roles/ironic-install/README.md +++ b/playbooks/roles/ironic-install/README.md @@ -74,7 +74,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express orimplied. +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.