Modify proton.cof and move files around

Change [keystone_authentication] to [keystone_authtoken] in proton.conf
doc/samples/proton.conf.sample is for documentation purpose, move to doc/samples
etc/proton/proton.conf is for installation to copy to /etc/proton, move to etc/proton

Change-Id: I68058c731accd5d883317f26adec2db310b74ba1

etc/proton/proton-config-generator.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-output_file = etc/proton/proton.conf.sample
+output_file = doc/samples/proton.conf.sample
 wrap_width = 79
 namespace = gluon.conf
 namespace = oslo.log

etc/proton/proton.conf

@@ -3,17 +3,26 @@
 [DEFAULT]
 state_path = /opt/proton
 
+
 [api]
 auth_strategy = keystone
 
-[keystone_authentication]
-auth_uri = http://127.0.0.1/identity
+
+[keystone_authtoken]
+
+# keystone identity, change 127.0.0.1 to keystone endpoint
+auth_uri = http://127.0.0.1/5000
+
 project_domain_name = Default
 project_name = service
 user_domain_name = Default
 password = welcome
 username = gluon
-auth_url = http://127.0.0.1/identity_admin
+
+# keystone identity_admin, change 127.0.0.1 to keystone endpoint
+auth_url = http://127.0.0.1/35357
+
+
 auth_type = password
 
 [oslo_policy]

etc/proton/proton.conf.sample.backup

@@ -1,2 +0,0 @@
-[DEFAULT]
-state_path = /var/lib/proton