diff --git a/etc/proton/proton.conf.sample b/doc/samples/proton.conf.sample similarity index 100% rename from etc/proton/proton.conf.sample rename to doc/samples/proton.conf.sample diff --git a/doc/samples/policy.json b/etc/proton/policy.json similarity index 100% rename from doc/samples/policy.json rename to etc/proton/policy.json diff --git a/etc/proton/proton-config-generator.conf b/etc/proton/proton-config-generator.conf index 9deb3d2..c9a3a66 100644 --- a/etc/proton/proton-config-generator.conf +++ b/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 diff --git a/doc/samples/proton.conf b/etc/proton/proton.conf similarity index 56% rename from doc/samples/proton.conf rename to etc/proton/proton.conf index 90a080b..cbdb6b3 100644 --- a/doc/samples/proton.conf +++ b/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] diff --git a/etc/proton/proton.conf.sample.backup b/etc/proton/proton.conf.sample.backup deleted file mode 100644 index f08b413..0000000 --- a/etc/proton/proton.conf.sample.backup +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -state_path = /var/lib/proton