Skip to content

Commit

Permalink
Chane configuration format from JSON to YAML
Browse files Browse the repository at this point in the history
  • Loading branch information
akscram committed Dec 27, 2016
1 parent 8028c77 commit 40dfd54
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ matrix:
- docker
install:
- docker build -t ceagle .
- docker run -d -p 127.0.0.1:5000:5000 -e "CEAGLE_CONF=/app/tests/ci/fake-clients-config.json" ceagle
- docker run -d -p 127.0.0.1:5000:5000 -e "CEAGLE_CONF=/app/tests/ci/fake-clients-config.yaml" ceagle
- git clone http://github.com/cybertk/abao
- cd abao
- git checkout 0.5.0
Expand Down
2 changes: 1 addition & 1 deletion ceagle/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.

DEFAULT_CONF_PATH = "/etc/ceagle/config.json"
DEFAULT_CONF_PATH = "/etc/ceagle/config.yaml"

DEFAULT = {
"use_fake_api_data": False,
Expand Down
45 changes: 45 additions & 0 deletions etc/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
services:
availability: http://dummy.example.org/api/availability
performance: http://dummy.example.org/api/performance
health: http://dummy.example.org/api/health
cis: http://dummy.example.org/api/cis
capacity: http://dummy.example.org/api/capacity
optimization: http://dummy.example.org/api/optimization
security: http://dummy.example.org/api/security
infra:
pages:
- title: Horizon
full_title: Horizon
menu: horzion
description: Web UI that manages OpenStack resources
iframe: http://nan

- title: Baremetal
full_title: Baremetal Provisioning
menu: baremetal
description: MaaS service that manages baremetal infrastructure
iframe: http://nan

- title: Jenkins CI/CD
full_title: Jenkins CI/CD
menu: jenkins
description: Cloud Continues Integration and Deployment.
iframe: http://nan

- title: Source Control
full_title: Git Source Control
menu: git
description: Gitlab with Git repositories with all projects source code
iframe: http://nan

- title: Packages
full_title: JFrog Artifactory Packages
menu: packages
description: JFrog Artifactory service that contains all cloud packages & images
iframe: http://nan

- title: Stacklight
full_title: Stacklight
menu: stacklight
description: Cloud Logging Metering and Alerting services
iframe: http://nan
58 changes: 0 additions & 58 deletions etc/eagle_config.json

This file was deleted.

4 changes: 2 additions & 2 deletions service/ceagle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ service:

files:
ceagle.conf:
path: /etc/ceagle/config.json
content: ceagle.json.j2
path: /etc/ceagle/config.yaml
content: ceagle.yaml.j2
6 changes: 0 additions & 6 deletions service/files/ceagle.json.j2

This file was deleted.

3 changes: 3 additions & 0 deletions service/files/ceagle.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
services:
availability: http://{{ address(availability-api port=availability.port) }}
health: http://{{ address(health-api port=health.port) }}
5 changes: 0 additions & 5 deletions tests/ci/fake-clients-config.json

This file was deleted.

2 changes: 2 additions & 0 deletions tests/ci/fake-clients-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
services:
security: http://example.org/api/security

0 comments on commit 40dfd54

Please sign in to comment.