openstack/kolla
Code Issues Proposed changes

Merge "Fix two missing toolbox references"

Browse Source
This commit is contained in:
Jenkins 2016-02-05 20:14:52 +00:00 committed by Gerrit Code Review
commit fbc650e009
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/nova/tasks/bootstrap.yml
View File

@ -18,7 +18,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Nova-api database - 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 -m mysql_db
-a "login_host='{{ database_address }}' -a "login_host='{{ database_address }}'
login_user='{{ database_user }}' login_user='{{ database_user }}'
@ -54,7 +54,7 @@
delegate_to: "{{ groups['nova-api'][0] }}" delegate_to: "{{ groups['nova-api'][0] }}"
- name: Creating Nova-api database user and setting permissions - 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 -m mysql_user
-a "login_host='{{ database_address }}' -a "login_host='{{ database_address }}'
login_user='{{ database_user }}' login_user='{{ database_user }}'

2
ansible/roles/swift/tasks/start.yml
View File

@ -1,6 +1,6 @@
--- ---
- name: Looking up disks for Swift - 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 -m find_disks
-a "name={{ swift_devices_name }} -a "name={{ swift_devices_name }}
match_mode={{ swift_devices_match_mode }}" match_mode={{ swift_devices_match_mode }}"