moonv43 ok

Change-Id: I5ca6724755137ec61d1f0df2e9ed9861de18a50b
Signed-off-by: RHE <rebirthmonkey@gmail.com>

diff --git a/README.md b/README.md
index 681bce9..2710d5a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -52,38 +52,8 @@ curl http://$MOON_HOST:30001
 curl http://$MOON_HOST:30001/pdp
 curl http://$MOON_HOST:30001/policies
 ```
-    
-If you configured the authentication in the Moon platform:
-```bash
-curl -i \
-  -H "Content-Type: application/json" \
-  -d '
-{ "auth": {
-    "identity": {
-      "methods": ["password"],
-      "password": {
-        "user": {
-          "name": "admin",
-          "domain": { "id": "default" },
-          "password": "<set_your_password_here>"
-        }
-      }
-    },
-    "scope": {
-      "project": {
-        "name": "admin",
-        "domain": { "id": "default" }
-      }
-    }
-  }
-}' \
-  "http://moon_hostname:30006/v3/auth/tokens" ; echo
-  
-curl --header "X-Auth-Token: <token_retrieve_from_keystone>" http://moon_hostname:30001
-curl --header "X-Auth-Token: <token_retrieve_from_keystone>" http://moon_hostname:30001/pdp
-curl --header "X-Auth-Token: <token_retrieve_from_keystone>" http://moon_hostname:30001/policies
-```
-    
+
+### Consul Check
 Check the Consul service for 
 - *Components/Manager*, e.g. 
 ```json
@@ -114,10 +84,44 @@ Check the Consul service for
 }
 ```
 
+### Tests
 Launch functional [test scenario](tests/functional/scenario_enabled) : 
 ```bash
-cd $MOON_HOME/tests/functional/scenario_enabled
-docker run -ti -v $(pwd):/data wukongsun/moon_forming:latest /bin/bash
-moon_populate_values --consul-host=$MOON_HOST --consul-port=30005 -v /data/rbac_large.py
-moon_send_authz --consul-host=$MOON_HOST --consul-port=30005 --authz-host=$MOON_HOST --authz-port=31002 -v /data/rbac_large.py
+sudo pip install python_moonclient --upgrade
+cd $MOON_HOME/tests/functional/scenario_tests
+moon_populate_values --consul-host=$MOON_HOST --consul-port=30005 -v rbac_large.py
+moon_send_authz --consul-host=$MOON_HOST --consul-port=30005 --authz-host=$AUTHZ_HOST --authz-port=$AUTHZ_PORT -v rbac_large.py
 ```
+
+## Annexe
+### Authentication
+If you configured the authentication in the Moon platform:
+```bash
+curl -i \
+  -H "Content-Type: application/json" \
+  -d '
+{ "auth": {
+    "identity": {
+      "methods": ["password"],
+      "password": {
+        "user": {
+          "name": "admin",
+          "domain": { "id": "default" },
+          "password": "<set_your_password_here>"
+        }
+      }
+    },
+    "scope": {
+      "project": {
+        "name": "admin",
+        "domain": { "id": "default" }
+      }
+    }
+  }
+}' \
+  "http://moon_hostname:30006/v3/auth/tokens" ; echo
+  
+curl --header "X-Auth-Token: <token_retrieve_from_keystone>" http://moon_hostname:30001
+curl --header "X-Auth-Token: <token_retrieve_from_keystone>" http://moon_hostname:30001/pdp
+curl --header "X-Auth-Token: <token_retrieve_from_keystone>" http://moon_hostname:30001/policies
+```
\ No newline at end of file

diff --git a/tools/moon_kubernetes/README.md b/tools/moon_kubernetes/README.md
index b47bbfa..73d342f 100644 (file)
--- a/tools/moon_kubernetes/README.md
+++ b/tools/moon_kubernetes/README.md
@@ -31,7 +31,7 @@ apt-get install -y kubelet kubeadm kubectl
 ### Initiate K8S
 ```bash
 cd $MOON_HOME
-bash tools/moon_kubernes/init_k8s.sh
+bash tools/moon_kubernetes/init_k8s.sh
 ```
 
 Wait until all the kubeadm containers are in the `running` state:
@@ -57,7 +57,7 @@ You must see something like this:
 ### Deploy Moon
 ```bash
 cd $MOON_HOME
-sudo bash tools/moon_kubernes/start_moon.sh
+sudo bash tools/moon_kubernetes/start_moon.sh
 ```
 
 Wait until all the Moon containers are in the `running` state: