summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-10-05 09:33:31 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-10-06 09:32:58 -0300
commit1ae447a3409afe4308e61f2511ab6dc1a9ca92cb (patch)
tree553802393edd257eedee927e2a3bece8c106e14f
parent0c01e07493a4660f3eade5b96abefaa5b1f062b9 (diff)
downloadopenshift-1ae447a3409afe4308e61f2511ab6dc1a9ca92cb.tar.gz
openshift-1ae447a3409afe4308e61f2511ab6dc1a9ca92cb.tar.bz2
openshift-1ae447a3409afe4308e61f2511ab6dc1a9ca92cb.tar.xz
openshift-1ae447a3409afe4308e61f2511ab6dc1a9ca92cb.zip
Error out if containerized=true for lb host.
-rw-r--r--inventory/byo/hosts.origin.example4
-rw-r--r--inventory/byo/hosts.ose.example4
-rw-r--r--roles/openshift_loadbalancer/tasks/main.yml4
3 files changed, 9 insertions, 3 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 7febefe95..225432f5c 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -596,8 +596,10 @@ ose3-master[1:3]-ansible.test.example.com
[etcd]
ose3-etcd[1:3]-ansible.test.example.com
+# NOTE: Containerized load balancer hosts are not yet supported, if using a global
+# containerized=true host variable we must set to false.
[lb]
-ose3-lb-ansible.test.example.com
+ose3-lb-ansible.test.example.com containerized=false
# NOTE: Currently we require that masters be part of the SDN which requires that they also be nodes
# However, in order to ensure that your masters are not burdened with running pods you should
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 2645d4510..e8ea2f3f0 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -596,8 +596,10 @@ ose3-master[1:3]-ansible.test.example.com
[etcd]
ose3-etcd[1:3]-ansible.test.example.com
+# NOTE: Containerized load balancer hosts are not yet supported, if using a global
+# containerized=true host variable we must set to false.
[lb]
-ose3-lb-ansible.test.example.com
+ose3-lb-ansible.test.example.com containerized=false
# NOTE: Currently we require that masters be part of the SDN which requires that they also be nodes
# However, in order to ensure that your masters are not burdened with running pods you should
diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml
index bb4982e2d..b8e6a7da2 100644
--- a/roles/openshift_loadbalancer/tasks/main.yml
+++ b/roles/openshift_loadbalancer/tasks/main.yml
@@ -1,7 +1,9 @@
---
+- fail: msg="Cannot use containerized=true for load balancer hosts."
+ when: openshift.common.is_containerized | bool
+
- name: Install haproxy
action: "{{ ansible_pkg_mgr }} name=haproxy state=present"
- when: not openshift.common.is_containerized | bool
- name: Configure systemd service directory for haproxy
file: