diff options
| author |   Thomas Duval <thomas.duval@orange.com> | 2017-11-03 16:12:24 +0100 |
|---|---|---|
| committer | Thomas Duval <thomas.duval@orange.com> | 2017-11-03 16:12:24 +0100 |
| commit | d39ba88a7fe8e1f600ad5ace9a0dd32154110550 (patch) | |
| tree | e4e53f407d7bf295017975e949f962999b72af92 /moonv4 | |
| parent | fa11d78e728029bcefa0ad6608d422715ae8f0be (diff) | |
Don't force the script to map the "admin" tenant to a PDP
Change-Id: I8b4cddd018b1869181304986f731b5529c3fd01a
Diffstat (limited to 'moonv4')
| -rw-r--r-- | moonv4/templates/moonforming/populate_default_values.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/moonv4/templates/moonforming/populate_default_values.py b/moonv4/templates/moonforming/populate_default_values.py index cd06ab1a..10b66201 100644 --- a/moonv4/templates/moonforming/populate_default_values.py +++ b/moonv4/templates/moonforming/populate_default_values.py @@ -204,13 +204,13 @@ def create_policy(model_id, meta_rule_list): def create_pdp(policy_id=None): logger.info("Creating PDP {}".format(scenario.pdp_name)) - projects = get_keystone_projects() - project_id = args.keystone_pid - if not project_id: - for _project in projects['projects']: - if _project['name'] == "admin": - project_id = _project['id'] - assert project_id + # projects = get_keystone_projects() + # project_id = args.keystone_pid + # if not project_id: + # for _project in projects['projects']: + # if _project['name'] == "admin": + # project_id = _project['id'] + # assert project_id pdps = check_pdp()["pdps"] for pdp_id, pdp_value in pdps.items(): if scenario.pdp_name == pdp_value["name"]: @@ -218,7 +218,7 @@ def create_pdp(policy_id=None): logger.debug("Found existing PDP named {} (will add policy {})".format(scenario.pdp_name, policy_id)) return pdp_id _pdp_id = add_pdp(name=scenario.pdp_name, policy_id=policy_id) - map_to_keystone(pdp_id=_pdp_id, keystone_project_id=project_id) + # map_to_keystone(pdp_id=_pdp_id, keystone_project_id=project_id) return _pdp_id if __name__ == "__main__": |