diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-05 20:14:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-05 20:14:52 +0000 |
| commit | fbc650e009e408e17d5b6c1aaf551fd572100aef (patch) | |
| tree | 2885ad1be56e60846ec63d896dff2773c6b9ccd8 | |
| parent | 5d642f1ad10a377290c744d2daeee884709f629b (diff) | |
| parent | 508f3863cc31351d878277a42f90aa0c6b4e6671 (diff) | |
| download | kolla-fbc650e009e408e17d5b6c1aaf551fd572100aef.tar.gz kolla-fbc650e009e408e17d5b6c1aaf551fd572100aef.zip | |
Merge "Fix two missing toolbox references"
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/swift/tasks/start.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index 4a41ad475..f67d44091 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -18,7 +18,7 @@ database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - name: Creating Nova-api database - command: docker exec -t kolla_ansible /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m mysql_db -a "login_host='{{ database_address }}' login_user='{{ database_user }}' @@ -54,7 +54,7 @@ delegate_to: "{{ groups['nova-api'][0] }}" - name: Creating Nova-api database user and setting permissions - command: docker exec -t kolla_ansible /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m mysql_user -a "login_host='{{ database_address }}' login_user='{{ database_user }}' diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index 9fbc9c562..70c45101a 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_ansible /usr/bin/ansible localhost + command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m find_disks -a "name={{ swift_devices_name }} match_mode={{ swift_devices_match_mode }}" |