From 72039e915d1fc960bd0d7fccd910ea282d61bee7 Mon Sep 17 00:00:00 2001 From: your name Date: Wed, 9 Sep 2015 03:26:11 -0400 Subject: Compass Netconfig optimization Change-Id: Icbcfc7d794623436f22be5f6763b212a25d4fac7 JIRA: COMPASS-30 --- deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml | 2 ++ deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'deploy/adapters/ansible/roles/cinder-controller') diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml index fe9f7dc8..77029b81 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml +++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml @@ -5,6 +5,7 @@ - name: sync cinder db shell: su -s /bin/sh -c "cinder-manage db sync" cinder && cinder register: result + run_once: True until: result.rc == 0 retries: 5 delay: 3 @@ -18,5 +19,6 @@ - name: run cinder register script shell: for i in {0..5}; do /opt/cinder_init.sh && touch cinder_init_complete; if [ $? != 0 ]; then sleep 5; else break; fi; done + run_once: True args: creates: cinder_init_complete diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml index 9faa456b..e6a5f04f 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml +++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml @@ -8,7 +8,6 @@ - cinder - include: cinder_config.yml - when: HA_CLUSTER is not defined or HA_CLUSTER[inventory_hostname] == '' tags: - config - cinder-config -- cgit 1.2.3-korg