diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2015-10-12 20:15:22 +0800 |
|---|---|---|
| committer | carey.xu <carey.xuhan@huawei.com> | 2015-10-13 11:37:11 +0800 |
| commit | 85d42c56cafb1b7426677c85f5fa0874c0858568 (patch) | |
| tree | ef51561e1bbd92104713b5f2cd24861e5e942a81 /deploy/adapters/ansible/roles/glance/tasks | |
| parent | 2cbacbc060805b446769def612253798f3b7fb03 (diff) | |
make internal vip and public vip into one group
JIRA: COMPASS-88
Change-Id: Ie40033b99d29e79c6a50b3073f4147109a02d7fa
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/glance/tasks')
3 files changed, 1 insertions, 32 deletions
diff --git a/deploy/adapters/ansible/roles/glance/tasks/glance_config.yml b/deploy/adapters/ansible/roles/glance/tasks/glance_config.yml index e2390d0e..548c2309 100644 --- a/deploy/adapters/ansible/roles/glance/tasks/glance_config.yml +++ b/deploy/adapters/ansible/roles/glance/tasks/glance_config.yml @@ -1,36 +1,7 @@ --- -- name: init glance db version - shell: glance-manage db_version_control 0 - run_once: True - when: ansible_os_family == "Debian" - - name: sync glance db - shell: sleep 15; su -s /bin/sh -c "glance-manage db_sync" glance - run_once: True - register: result - until: result.rc == 0 - retries: 5 - delay: 3 + glance_manage: action=dbsync notify: - restart glance services - meta: flush_handlers - -- name: place image upload script - template: src=image_upload.sh dest=/opt/image_upload.sh mode=0744 - -- name: get image http server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: http_server - -- name: download cirros image file - get_url: url="http://{{ http_server.stdout_lines[0] }}/image/{{ build_in_image_name }}" dest=/opt/{{ build_in_image_name }} - -- name: wait for 9292 port to become available - wait_for: host={{ image_host }} port=9292 delay=5 - -- name: run image upload - run_once: True - shell: for i in {0..5}; do /opt/image_upload.sh && touch image_upload_completed; if [ $? != 0 ] ;then sleep 5; else break;fi;done - args: - creates: image_upload_completed diff --git a/deploy/adapters/ansible/roles/glance/tasks/glance_install.yml b/deploy/adapters/ansible/roles/glance/tasks/glance_install.yml index 294b35e8..6d2b7053 100644 --- a/deploy/adapters/ansible/roles/glance/tasks/glance_install.yml +++ b/deploy/adapters/ansible/roles/glance/tasks/glance_install.yml @@ -18,4 +18,3 @@ - name: remove default sqlite db shell: rm /var/lib/glance/glance.sqlite || touch glance.sqllite.db.removed - diff --git a/deploy/adapters/ansible/roles/glance/tasks/main.yml b/deploy/adapters/ansible/roles/glance/tasks/main.yml index 64b8ca9d..7cbcfa96 100644 --- a/deploy/adapters/ansible/roles/glance/tasks/main.yml +++ b/deploy/adapters/ansible/roles/glance/tasks/main.yml @@ -17,4 +17,3 @@ - config - glance_config - glance - |