README.md in beaker-hostgenerator-0.8.4 vs README.md in beaker-hostgenerator-0.9.0
- old
+ new
@@ -10,10 +10,11 @@
- [Hypervisors](#hypervisors)
- [Usage](#usage)
- [Simple two-host layout](#simple-two-host-layout)
- [Single host with Arbitrary Roles](#single-host-with-arbitrary-roles)
- [Two hosts with multiple hypervisors and arbitrary host settings](#two-hosts-with-multiple-hypervisors-and-arbitrary-host-settings)
+ - [Two hosts with arbitrary host settings with arbitrary lists](#two-hosts-with-arbitrary-host-settings-with-arbitrary-lists)
- [Arbitrary global configuration settings](#arbitrary-global-configuration-settings)
- [Custom hypervisor](#custom-hypervisor)
- [URL-encoded input](#url-encoded-input)
- [Testing](#testing)
- [Test Fixtures](#test-fixtures)
@@ -155,10 +156,53 @@
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
```
+### Two hosts with arbitrary host settings with arbitrary lists
+
+```
+$ beaker-hostgenerator centos6-64m{disks=\[16\]-redhat7-64a{disks=\[8\,16\]}
+```
+
+Will generate
+
+```yaml
+---
+HOSTS:
+ centos6-64-1:
+ pe_dir:
+ pe_ver:
+ pe_upgrade_dir:
+ pe_upgrade_ver:
+ platform: el-6-x86_64
+ hypervisor: vmpooler
+ disks:
+ - 16
+ roles:
+ - agent
+ - master
+ redhat7-64-1:
+ pe_dir:
+ pe_ver:
+ pe_upgrade_dir:
+ pe_upgrade_ver:
+ hypervisor: vmpooler
+ platform: el-7-x86_64
+ template: redhat-7-x86_64
+ disks:
+ - 8
+ - 16
+ roles:
+ - agent
+CONFIG:
+ nfs_server: none
+ consoleport: 443
+ pooling_api: http://vmpooler.delivery.puppetlabs.net/
+```
+
+
### Arbitrary global configuration settings
```
$ beaker-hostgenerator --global-config {preserve_hosts=onfail\,log_level=debug\,server.ip=12.345.6789} redhat7-64m
```
@@ -225,15 +269,17 @@
It may be necessary to URL-encode the input in order for it to properly be used
in certain contexts, such as Jenkins.
In most cases it will only be necessary to escape the characters that support
-arbitrary settings, which means the following four characters:
+arbitrary settings, which means the following characters:
- `{` is `%7B`
- `,` is `%2C`
- `}` is `%7D`
- ` ` is `%20`
+- `[` is `%5B`
+- `]` is `%5D`
For a full URL encoding reference see: http://www.w3schools.com/tags/ref_urlencode.asp
```
$ beaker-hostgenerator centos6-64mcd-aix53-POWERfa%7Bhypervisor=aix%2Cvmhostname=pe-aix-53-acceptance.delivery.puppetlabs.net%7D