From: asteroide Date: Fri, 22 Apr 2016 14:06:08 +0000 (+0200) Subject: Move policy files to a better location for the installation process. X-Git-Tag: colorado.1.0~58 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F12585%2F1;p=moon.git Move policy files to a better location for the installation process. Change-Id: If74a878058983df8e432927e87b3da69214d9888 --- diff --git a/keystone-moon/MANIFEST.in b/keystone-moon/MANIFEST.in index 39db99e6..c810f913 100644 --- a/keystone-moon/MANIFEST.in +++ b/keystone-moon/MANIFEST.in @@ -10,7 +10,7 @@ include run_tests.sh include setup.cfg include setup.py include tox.ini -include etc/* +graft etc include httpd/* graft bin graft doc diff --git a/keystone-moon/examples/moon/policies/policy_authz/assignment.json b/keystone-moon/etc/policies/policy_authz/assignment.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_authz/assignment.json rename to keystone-moon/etc/policies/policy_authz/assignment.json diff --git a/keystone-moon/examples/moon/policies/policy_authz/metadata.json b/keystone-moon/etc/policies/policy_authz/metadata.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_authz/metadata.json rename to keystone-moon/etc/policies/policy_authz/metadata.json diff --git a/keystone-moon/examples/moon/policies/policy_authz/metarule.json b/keystone-moon/etc/policies/policy_authz/metarule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_authz/metarule.json rename to keystone-moon/etc/policies/policy_authz/metarule.json diff --git a/keystone-moon/examples/moon/policies/policy_authz/perimeter.json b/keystone-moon/etc/policies/policy_authz/perimeter.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_authz/perimeter.json rename to keystone-moon/etc/policies/policy_authz/perimeter.json diff --git a/keystone-moon/examples/moon/policies/policy_authz/rule.json b/keystone-moon/etc/policies/policy_authz/rule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_authz/rule.json rename to keystone-moon/etc/policies/policy_authz/rule.json diff --git a/keystone-moon/examples/moon/policies/policy_authz/scope.json b/keystone-moon/etc/policies/policy_authz/scope.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_authz/scope.json rename to keystone-moon/etc/policies/policy_authz/scope.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_admin/assignment.json b/keystone-moon/etc/policies/policy_empty_admin/assignment.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_admin/assignment.json rename to keystone-moon/etc/policies/policy_empty_admin/assignment.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_admin/metadata.json b/keystone-moon/etc/policies/policy_empty_admin/metadata.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_admin/metadata.json rename to keystone-moon/etc/policies/policy_empty_admin/metadata.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_admin/metarule.json b/keystone-moon/etc/policies/policy_empty_admin/metarule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_admin/metarule.json rename to keystone-moon/etc/policies/policy_empty_admin/metarule.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_admin/perimeter.json b/keystone-moon/etc/policies/policy_empty_admin/perimeter.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_admin/perimeter.json rename to keystone-moon/etc/policies/policy_empty_admin/perimeter.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_admin/rule.json b/keystone-moon/etc/policies/policy_empty_admin/rule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_admin/rule.json rename to keystone-moon/etc/policies/policy_empty_admin/rule.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_admin/scope.json b/keystone-moon/etc/policies/policy_empty_admin/scope.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_admin/scope.json rename to keystone-moon/etc/policies/policy_empty_admin/scope.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_authz/assignment.json b/keystone-moon/etc/policies/policy_empty_authz/assignment.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_authz/assignment.json rename to keystone-moon/etc/policies/policy_empty_authz/assignment.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_authz/metadata.json b/keystone-moon/etc/policies/policy_empty_authz/metadata.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_authz/metadata.json rename to keystone-moon/etc/policies/policy_empty_authz/metadata.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_authz/metarule.json b/keystone-moon/etc/policies/policy_empty_authz/metarule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_authz/metarule.json rename to keystone-moon/etc/policies/policy_empty_authz/metarule.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_authz/perimeter.json b/keystone-moon/etc/policies/policy_empty_authz/perimeter.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_authz/perimeter.json rename to keystone-moon/etc/policies/policy_empty_authz/perimeter.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_authz/rule.json b/keystone-moon/etc/policies/policy_empty_authz/rule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_authz/rule.json rename to keystone-moon/etc/policies/policy_empty_authz/rule.json diff --git a/keystone-moon/examples/moon/policies/policy_empty_authz/scope.json b/keystone-moon/etc/policies/policy_empty_authz/scope.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_empty_authz/scope.json rename to keystone-moon/etc/policies/policy_empty_authz/scope.json diff --git a/keystone-moon/examples/moon/policies/policy_mls_authz/assignment.json b/keystone-moon/etc/policies/policy_mls_authz/assignment.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_mls_authz/assignment.json rename to keystone-moon/etc/policies/policy_mls_authz/assignment.json diff --git a/keystone-moon/examples/moon/policies/policy_mls_authz/metadata.json b/keystone-moon/etc/policies/policy_mls_authz/metadata.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_mls_authz/metadata.json rename to keystone-moon/etc/policies/policy_mls_authz/metadata.json diff --git a/keystone-moon/examples/moon/policies/policy_mls_authz/metarule.json b/keystone-moon/etc/policies/policy_mls_authz/metarule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_mls_authz/metarule.json rename to keystone-moon/etc/policies/policy_mls_authz/metarule.json diff --git a/keystone-moon/examples/moon/policies/policy_mls_authz/perimeter.json b/keystone-moon/etc/policies/policy_mls_authz/perimeter.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_mls_authz/perimeter.json rename to keystone-moon/etc/policies/policy_mls_authz/perimeter.json diff --git a/keystone-moon/examples/moon/policies/policy_mls_authz/rule.json b/keystone-moon/etc/policies/policy_mls_authz/rule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_mls_authz/rule.json rename to keystone-moon/etc/policies/policy_mls_authz/rule.json diff --git a/keystone-moon/examples/moon/policies/policy_mls_authz/scope.json b/keystone-moon/etc/policies/policy_mls_authz/scope.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_mls_authz/scope.json rename to keystone-moon/etc/policies/policy_mls_authz/scope.json diff --git a/keystone-moon/examples/moon/policies/policy_rbac_admin/assignment.json b/keystone-moon/etc/policies/policy_rbac_admin/assignment.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_rbac_admin/assignment.json rename to keystone-moon/etc/policies/policy_rbac_admin/assignment.json diff --git a/keystone-moon/examples/moon/policies/policy_rbac_admin/metadata.json b/keystone-moon/etc/policies/policy_rbac_admin/metadata.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_rbac_admin/metadata.json rename to keystone-moon/etc/policies/policy_rbac_admin/metadata.json diff --git a/keystone-moon/examples/moon/policies/policy_rbac_admin/metarule.json b/keystone-moon/etc/policies/policy_rbac_admin/metarule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_rbac_admin/metarule.json rename to keystone-moon/etc/policies/policy_rbac_admin/metarule.json diff --git a/keystone-moon/examples/moon/policies/policy_rbac_admin/perimeter.json b/keystone-moon/etc/policies/policy_rbac_admin/perimeter.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_rbac_admin/perimeter.json rename to keystone-moon/etc/policies/policy_rbac_admin/perimeter.json diff --git a/keystone-moon/examples/moon/policies/policy_rbac_admin/rule.json b/keystone-moon/etc/policies/policy_rbac_admin/rule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_rbac_admin/rule.json rename to keystone-moon/etc/policies/policy_rbac_admin/rule.json diff --git a/keystone-moon/examples/moon/policies/policy_rbac_admin/scope.json b/keystone-moon/etc/policies/policy_rbac_admin/scope.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_rbac_admin/scope.json rename to keystone-moon/etc/policies/policy_rbac_admin/scope.json diff --git a/keystone-moon/examples/moon/policies/policy_root/assignment.json b/keystone-moon/etc/policies/policy_root/assignment.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_root/assignment.json rename to keystone-moon/etc/policies/policy_root/assignment.json diff --git a/keystone-moon/examples/moon/policies/policy_root/metadata.json b/keystone-moon/etc/policies/policy_root/metadata.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_root/metadata.json rename to keystone-moon/etc/policies/policy_root/metadata.json diff --git a/keystone-moon/examples/moon/policies/policy_root/metarule.json b/keystone-moon/etc/policies/policy_root/metarule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_root/metarule.json rename to keystone-moon/etc/policies/policy_root/metarule.json diff --git a/keystone-moon/examples/moon/policies/policy_root/perimeter.json b/keystone-moon/etc/policies/policy_root/perimeter.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_root/perimeter.json rename to keystone-moon/etc/policies/policy_root/perimeter.json diff --git a/keystone-moon/examples/moon/policies/policy_root/rule.json b/keystone-moon/etc/policies/policy_root/rule.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_root/rule.json rename to keystone-moon/etc/policies/policy_root/rule.json diff --git a/keystone-moon/examples/moon/policies/policy_root/scope.json b/keystone-moon/etc/policies/policy_root/scope.json similarity index 100% rename from keystone-moon/examples/moon/policies/policy_root/scope.json rename to keystone-moon/etc/policies/policy_root/scope.json diff --git a/keystone-moon/examples/moon/__init__.py b/keystone-moon/examples/moon/__init__.py deleted file mode 100644 index 1b678d53..00000000 --- a/keystone-moon/examples/moon/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors -# This software is distributed under the terms and conditions of the 'Apache-2.0' -# license which can be found in the file 'LICENSE' in this package distribution -# or at 'http://www.apache.org/licenses/LICENSE-2.0'.