Move policy files to a better location for the installation process.

Change-Id: If74a878058983df8e432927e87b3da69214d9888

38 files changed, 1 insertions, 5 deletions

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
index 7a6c722e..7a6c722e 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/assignment.json
+++ b/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
index d0db90db..d0db90db 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/metadata.json
+++ b/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
index c9afd6c2..c9afd6c2 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/metarule.json
+++ b/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
index 47a8ee45..47a8ee45 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/perimeter.json
+++ b/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
index 25f9d93a..25f9d93a 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/rule.json
+++ b/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
index 9b313daf..9b313daf 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/scope.json
+++ b/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
index 24018a09..24018a09 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_admin/assignment.json
+++ b/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
index 3c9be2e5..3c9be2e5 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_admin/metadata.json
+++ b/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
index 7acd8848..7acd8848 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_admin/metarule.json
+++ b/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
index 54dbfc31..54dbfc31 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_admin/perimeter.json
+++ b/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
index fe4fae5a..fe4fae5a 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_admin/rule.json
+++ b/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
index 1efebe6f..1efebe6f 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_admin/scope.json
+++ b/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
index 24018a09..24018a09 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_authz/assignment.json
+++ b/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
index 4f300d78..4f300d78 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_authz/metadata.json
+++ b/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
index 7acd8848..7acd8848 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_authz/metarule.json
+++ b/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
index 9da8a8c0..9da8a8c0 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_authz/perimeter.json
+++ b/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
index fe4fae5a..fe4fae5a 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_authz/rule.json
+++ b/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
index 1efebe6f..1efebe6f 100644
--- a/keystone-moon/examples/moon/policies/policy_empty_authz/scope.json
+++ b/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
index 0712dfbc..0712dfbc 100644
--- a/keystone-moon/examples/moon/policies/policy_mls_authz/assignment.json
+++ b/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
index c419c815..c419c815 100644
--- a/keystone-moon/examples/moon/policies/policy_mls_authz/metadata.json
+++ b/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
index e068927c..e068927c 100644
--- a/keystone-moon/examples/moon/policies/policy_mls_authz/metarule.json
+++ b/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
index 47a8ee45..47a8ee45 100644
--- a/keystone-moon/examples/moon/policies/policy_mls_authz/perimeter.json
+++ b/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
index b17dc822..b17dc822 100644
--- a/keystone-moon/examples/moon/policies/policy_mls_authz/rule.json
+++ b/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
index 6cc1c28e..6cc1c28e 100644
--- a/keystone-moon/examples/moon/policies/policy_mls_authz/scope.json
+++ b/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
index f2378333..f2378333 100644
--- a/keystone-moon/examples/moon/policies/policy_rbac_admin/assignment.json
+++ b/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
index 9ee8a11d..9ee8a11d 100644
--- a/keystone-moon/examples/moon/policies/policy_rbac_admin/metadata.json
+++ b/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
index 86dbfad2..86dbfad2 100644
--- a/keystone-moon/examples/moon/policies/policy_rbac_admin/metarule.json
+++ b/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
index 1155533e..1155533e 100644
--- a/keystone-moon/examples/moon/policies/policy_rbac_admin/perimeter.json
+++ b/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
index c89ceff3..c89ceff3 100644
--- a/keystone-moon/examples/moon/policies/policy_rbac_admin/rule.json
+++ b/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
index 149056a6..149056a6 100644
--- a/keystone-moon/examples/moon/policies/policy_rbac_admin/scope.json
+++ b/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
index e849ae13..e849ae13 100644
--- a/keystone-moon/examples/moon/policies/policy_root/assignment.json
+++ b/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
index 3e4b0f28..3e4b0f28 100644
--- a/keystone-moon/examples/moon/policies/policy_root/metadata.json
+++ b/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
index 86dbfad2..86dbfad2 100644
--- a/keystone-moon/examples/moon/policies/policy_root/metarule.json
+++ b/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
index 788a27f2..788a27f2 100644
--- a/keystone-moon/examples/moon/policies/policy_root/perimeter.json
+++ b/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
index 9bbd5e4c..9bbd5e4c 100644
--- a/keystone-moon/examples/moon/policies/policy_root/rule.json
+++ b/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
index 43f9ced8..43f9ced8 100644
--- a/keystone-moon/examples/moon/policies/policy_root/scope.json
+++ b/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'.