diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2015-04-15 20:37:01 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2015-04-15 20:37:01 -0400 |
| commit | 82cddd2515d2a355425bb1cd898209d766c62b77 (patch) | |
| tree | 45212a1c47fbee630baf7613674d50a2f5dbe9fe /playbooks/libvirt/openshift-cluster | |
| parent | e85ad297c1be0186261e7be4403e8e0a702277ab (diff) | |
| parent | b71037de41baf06889b7a875a0e8914f940ecc2a (diff) | |
| download | openshift-82cddd2515d2a355425bb1cd898209d766c62b77.tar.gz openshift-82cddd2515d2a355425bb1cd898209d766c62b77.tar.bz2 openshift-82cddd2515d2a355425bb1cd898209d766c62b77.tar.xz openshift-82cddd2515d2a355425bb1cd898209d766c62b77.zip | |
Merge pull request #20 from lhuard1A/locale_proof
Make the error message checks locale proof
Diffstat (limited to 'playbooks/libvirt/openshift-cluster')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml | 2 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml index a320e681e..3117d9edc 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml @@ -3,7 +3,7 @@ command: "virsh -c {{ libvirt_uri }} net-info {{ libvirt_network }}" register: net_info_result changed_when: False - failed_when: "net_info_result.rc != 0 and 'error: Network not found:' not in net_info_result.stderr" + failed_when: "net_info_result.rc != 0 and 'no network with matching name' not in net_info_result.stderr" - name: Create a temp directory for the template xml file command: "mktemp -d /tmp/openshift-ansible-XXXXXXX" diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml index 817acb250..10715f2b5 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml @@ -16,7 +16,7 @@ command: "virsh -c {{ libvirt_uri }} pool-info {{ libvirt_storage_pool }}" register: pool_info_result changed_when: False - failed_when: "pool_info_result.rc != 0 and 'error: Storage pool not found:' not in pool_info_result.stderr" + failed_when: "pool_info_result.rc != 0 and 'no storage pool with matching name' not in pool_info_result.stderr" - name: Create the libvirt storage pool for openshift command: 'virsh -c {{ libvirt_uri }} pool-create-as {{ libvirt_storage_pool }} dir --target {{ libvirt_storage_pool_path }}' |