diff options
| -rw-r--r-- | examples/lib.yaml | 6 | ||||
| -rw-r--r-- | test_merge.bash | 33 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 2 |
3 files changed, 24 insertions, 17 deletions
diff --git a/examples/lib.yaml b/examples/lib.yaml index e527d83f..d42e95f8 100644 --- a/examples/lib.yaml +++ b/examples/lib.yaml @@ -1,7 +1,9 @@ Parameters: ImportantValue: - Default: a_default - Type: String + Default: a_default + Type: String + BImage: + Type: String Resources: GenericB: Type: OS::Nova::Server diff --git a/test_merge.bash b/test_merge.bash index 35390aaa..004a613e 100644 --- a/test_merge.bash +++ b/test_merge.bash @@ -7,18 +7,23 @@ cleanup() { fi } trap cleanup EXIT -result=$(mktemp /tmp/test_merge.XXXXXX) -fail=0 -python merge.py examples/source.yaml > $result -if ! cmp $result examples/source_lib_result.yaml ; then - diff -u $result examples/source_lib_result.yaml - echo - echo FAIL - merge of source.yaml result does not match expected output - echo - fail=1 -else - echo - echo PASS - merge of source.yaml result matches expected output - echo -fi +run_test() { + local cmd=$1 + local expected=$2 + result=$(mktemp /tmp/test_merge.XXXXXX) + fail=0 + $cmd > $result + if ! cmp $result $expected ; then + diff -u $expected $result || : + echo FAIL - $cmd result does not match expected + fail=1 + else + echo PASS - $cmd + fi + cleanup +} +echo +run_test "python merge.py examples/source.yaml" examples/source_lib_result.yaml +echo +trap - EXIT exit $fail diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 58b61696..8c948caf 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -140,7 +140,7 @@ Resources: db: mysql://keystone:unset@localhost/keystone host: 127.0.0.1 nova: - compute_hostname: ubuntu + compute_hostname: undercloud compute_driver: baremetal.driver.BareMetalDriver db: mysql://nova:unset@localhost/nova host: 127.0.0.1 |