aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-02-05 17:24:39 +0000
committerSamYaple <sam@yaple.net>2016-02-05 17:24:39 +0000
commit508f3863cc31351d878277a42f90aa0c6b4e6671 (patch)
treeeedcf5c136d5df13dc9b5410e52520258fb8d51a
parentb891afd64c7bcd351cde324591dc4d915f550a51 (diff)
downloadkolla-508f3863cc31351d878277a42f90aa0c6b4e6671.tar.gz
kolla-508f3863cc31351d878277a42f90aa0c6b4e6671.zip
Fix two missing toolbox references
Two patches merged that did not have teh correct name for kolla_toolbox TrivialFix Change-Id: I09e230e29cff496247c32bf227715bfb7caa0a95
-rw-r--r--ansible/roles/nova/tasks/bootstrap.yml4
-rw-r--r--ansible/roles/swift/tasks/start.yml2
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 }}"