diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-08 15:22:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-08 15:22:24 +0000 |
| commit | 0f9534bc2339b20544abff33da87ec809e66e1a1 (patch) | |
| tree | 95f7a0bcdce9c74a955c196b1cf1f2d774d8092b /ansible | |
| parent | 56178a58dc1ea3f9117f4c03893ebafcf0e1f57c (diff) | |
| parent | cadf8afdcf4c1d56892b6d708003066e11711c5f (diff) | |
| download | kolla-0f9534bc2339b20544abff33da87ec809e66e1a1.tar.gz kolla-0f9534bc2339b20544abff33da87ec809e66e1a1.zip | |
Merge "Read GPT label using sgdisk rather than udev"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/ceph/tasks/bootstrap_osds.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/do_reconfigure.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/start_osds.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/tasks/start.yml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml index 47a9459c8..014d2dcd4 100644 --- a/ansible/roles/ceph/tasks/bootstrap_osds.yml +++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml @@ -1,6 +1,6 @@ --- - name: Looking up disks to bootstrap for Ceph OSDs - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost -m find_disks -a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP' match_mode='prefix'" register: osd_lookup @@ -12,7 +12,7 @@ osds_bootstrap: "{{ (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}" - name: Looking up disks to bootstrap for Ceph Cache OSDs - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost -m find_disks -a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP' match_mode='prefix'" register: osd_cache_lookup diff --git a/ansible/roles/ceph/tasks/do_reconfigure.yml b/ansible/roles/ceph/tasks/do_reconfigure.yml index 0406c3bf9..e1c799952 100644 --- a/ansible/roles/ceph/tasks/do_reconfigure.yml +++ b/ansible/roles/ceph/tasks/do_reconfigure.yml @@ -10,7 +10,7 @@ - { name: ceph_mon, group: ceph-mon } - name: Looking up OSDs for Ceph - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost -m find_disks -a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix'" register: osd_lookup diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml index 0f4a9a76e..c615cd605 100644 --- a/ansible/roles/ceph/tasks/start_osds.yml +++ b/ansible/roles/ceph/tasks/start_osds.yml @@ -1,6 +1,6 @@ --- - name: Looking up OSDs for Ceph - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost -m find_disks -a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix'" register: osd_lookup diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index 2f6db1f70..9a2c6bbd7 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -1,6 +1,6 @@ --- - name: Looking up disks for Swift - command: docker exec -t kolla_toolbox /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox sudo -E /usr/bin/ansible localhost -m find_disks -a "name={{ swift_devices_name }} match_mode={{ swift_devices_match_mode }}" |