Code refactoring

* Add possibility to set keystone protocol (http/https)
* Some improvements in code
diff --git a/tests/pillar/shibboleth.sls b/tests/pillar/shibboleth.sls
index be0df94..ac37774 100644
--- a/tests/pillar/shibboleth.sls
+++ b/tests/pillar/shibboleth.sls
@@ -1,7 +1,10 @@
 shibboleth:
   server:
     enabled: true
-    idp_entity_id_url: "https://saml.example.com/oam/fed"
+    keystone_protocol: http
+    keystone_public_address: ${_param:proxy_vip_address_public}
+    keystone_port: 5000
+    idp_url: "https://saml.example.com/oam/fed"
     idp_metadata_url: "https://saml.example.com/oamfed/idp/metadata"
     attributes:
     - name: test