Merge "Add tls-proxy as an available service"

2016-03-07 14:30:39 +00:00 · 2016-03-07 14:30:39 +00:00 · 47c7161e98
parent 7026584d21 4ee1b9d78e
commit 47c7161e98
1 changed files with 6 additions and 0 deletions
--- a/features.yaml
+++ b/features.yaml
@ -43,6 +43,8 @@ config:
    features: [ceph]
  heat:
    features: [heat]
+  tlsproxy:
+    features: [tlsproxy]

 branches:
  # The value of ""default" is the name of the "trunk" branch
@ -154,3 +156,7 @@ features:
  ceph:
    base:
      services: [ceph]
+
+  tlsproxy:
+    base:
+      services: [tls-proxy]