X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmframework%2Fsrc%2Fcmframework%2Futils%2Fcmansibleplaybooks.py;h=5a91a1b80e84b8a399338b64193ae0475f1566f3;hb=refs%2Fchanges%2F42%2F742%2F10;hp=6d26dc5d4b42abfa0959e336c71a893202c5a641;hpb=eab13b2a30c8ace45b72b4560392a8ec6f41c128;p=ta%2Fconfig-manager.git diff --git a/cmframework/src/cmframework/utils/cmansibleplaybooks.py b/cmframework/src/cmframework/utils/cmansibleplaybooks.py index 6d26dc5..5a91a1b 100644 --- a/cmframework/src/cmframework/utils/cmansibleplaybooks.py +++ b/cmframework/src/cmframework/utils/cmansibleplaybooks.py @@ -35,20 +35,29 @@ class AnsiblePlaybooks(object): postconfig_lists, postconfig_size = self._get_playbook_lists(self.postconfig_path) finalize_lists, finalize_size = self._get_playbook_lists(self.finalize_path) - number_of_playbooks = bootstrapping_size \ - + provisioning_size \ - + postconfig_size \ - + finalize_size + number_of_playbooks = bootstrapping_size+provisioning_size+postconfig_size+finalize_size playbook_percentage_value = 99.0 / number_of_playbooks - self._generate_playbook(bootstrapping_lists, self.bootstrapping_playbook, 0, playbook_percentage_value) + self._generate_playbook(bootstrapping_lists, + self.bootstrapping_playbook, + 0, + playbook_percentage_value) + progress_start = bootstrapping_size*playbook_percentage_value - self._generate_playbook(provisioning_lists, self.provisioning_playbook, progress_start, playbook_percentage_value) + self._generate_playbook(provisioning_lists, + self.provisioning_playbook, + progress_start, + playbook_percentage_value) progress_start = (bootstrapping_size+provisioning_size)*playbook_percentage_value - self._generate_playbook(postconfig_lists, self.postconfig_playbook, progress_start, playbook_percentage_value) - progress_start = (bootstrapping_size+provisioning_size+postconfig_size)*playbook_percentage_value - self._generate_playbook(finalize_lists, self.finalize_playbook, progress_start, playbook_percentage_value) + self._generate_playbook(postconfig_lists, self.postconfig_playbook, + progress_start, playbook_percentage_value) + progress_start = (bootstrapping_size + + provisioning_size+postconfig_size)*playbook_percentage_value + self._generate_playbook(finalize_lists, + self.finalize_playbook, + progress_start, + playbook_percentage_value) def _get_playbook_lists(self, directory): graph = self._get_dependency_graph(directory)