summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-02-27 11:19:45 +0100
committervarac <varacanero@zeromail.org>2017-02-27 11:19:54 +0100
commit1f3070ac25321206e5a9c29e6b2c4fb06bd5baa9 (patch)
tree97e4e68259840a0a45f71507e3b038ca70bf5eeb
parentc5706051097593628b33a2abbc2eb2e5d59b44ff (diff)
Only deploy 8144_remove_haproxy branch to orangutan
-rw-r--r--hiera/orangutan.yaml10
-rw-r--r--provider.singlenode.json2
2 files changed, 1 insertions, 11 deletions
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index 61c1105..db3aa20 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -163,16 +163,6 @@ firewall:
- 6425
- 80
to: "37.218.247.46"
-haproxy:
- couch:
- listen_port: 4096
- servers:
- orangutan:
- backup: false
- host: localhost
- port: 5984
- weight: 10
- writable: true
hosts:
orangutan:
aliases:
diff --git a/provider.singlenode.json b/provider.singlenode.json
index 3c61923..0548fe7 100644
--- a/provider.singlenode.json
+++ b/provider.singlenode.json
@@ -4,6 +4,6 @@
"allow_anonymous": false
},
"platform": {
- "branch": "master"
+ "branch": "8144_remove_haproxy"
}
}