diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-06 10:27:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 10:27:15 -0400 |
| commit | 7a5cd4a48e586bd05f10af2787e44d585793c120 (patch) | |
| tree | e3e29fe4d504751f44778aba4cb168d6290b01b7 | |
| parent | 51395fea9e7b7eb534eb89461568691904497262 (diff) | |
| parent | 1ae447a3409afe4308e61f2511ab6dc1a9ca92cb (diff) | |
| download | openshift-7a5cd4a48e586bd05f10af2787e44d585793c120.tar.gz openshift-7a5cd4a48e586bd05f10af2787e44d585793c120.tar.bz2 openshift-7a5cd4a48e586bd05f10af2787e44d585793c120.tar.xz openshift-7a5cd4a48e586bd05f10af2787e44d585793c120.zip | |
Merge pull request #2548 from dgoodwin/containerized-b
Error out if containerized=true for lb host.
| -rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 4 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 0513a70fd..397fc3dbd 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -625,8 +625,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 8515a4c55..cbd2440c7 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -625,8 +625,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: |