x/marshal
Code Issues Proposed changes

Some cleanup

Browse Source 
Change-Id: I5f1337afae3df199b100ad934119704794e77553
This commit is contained in:
Dave McCowan 2015-10-23 08:20:44 -04:00
parent 0f79632f94
commit 033544c9c5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -51,10 +51,10 @@
#### Clone to local repository: #### Clone to local repository:
#####Via SSH: #####Via SSH:
```$ git clone git@github.com:CiscoCloud/marshal.git ``` ```$ git clone git@github.com:openstack/marshal.git ```
#####Via HTTPS: #####Via HTTPS:
```$ git clone https://github.com/CiscoCloud/marshal.git ``` ```$ git clone https://github.com/openstack/marshal.git ```
### Software Requirements ### Software Requirements

4
etc/marshal/marshal.conf
View File

@ -15,10 +15,10 @@ log_file = /var/log/marshal/marshal.log
#kms_type=barbican #kms_type=barbican
kms_type=vault kms_type=vault
#barbican #barbican
#kms_base=http://173.39.229.98:9311/v1 #kms_base=http://localhost:9311/v1
#kms_get_key_api=/secrets/ #kms_get_key_api=/secrets/
#vault #vault
#kms_base=http://173.39.225.119:80/v1 #kms_base=http://localhost:80/v1
kms_get_key_api=/secret/project/name/apikey kms_get_key_api=/secret/project/name/apikey
[crypt] [crypt]

2
tmp/license_vault.json
View File

@ -5,7 +5,7 @@
"token":"e391ee37-b8fb-69c0-e3fd-7d485b2b516a" "token":"e391ee37-b8fb-69c0-e3fd-7d485b2b516a"
}, },
"endpoint": { "endpoint": {
"kms_base":"http://173.39.225.119:80/v1", "kms_base":"http://localhost:80/v1",
"kms_get_key_api":"/secret/project/name/apikey" "kms_get_key_api":"/secret/project/name/apikey"
} }
} }