diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-08-25 16:28:11 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-04 19:57:22 -0500 |
| commit | a094ba9c632d9b0f66f49d35f6fed26e4b118a12 (patch) | |
| tree | 1a155206135aa0ca911deb459de261faff4376a8 | |
| parent | 037d77599632faa81f0c6ca1e912a19f04628b55 (diff) | |
| download | openshift-a094ba9c632d9b0f66f49d35f6fed26e4b118a12.tar.gz openshift-a094ba9c632d9b0f66f49d35f6fed26e4b118a12.tar.bz2 openshift-a094ba9c632d9b0f66f49d35f6fed26e4b118a12.tar.xz openshift-a094ba9c632d9b0f66f49d35f6fed26e4b118a12.zip | |
hardcode openshift binaries for now
| -rw-r--r-- | inventory/byo/hosts.example | 14 | ||||
| -rw-r--r-- | roles/openshift_master/files/atomic-openshift-master-api.service | 2 | ||||
| -rw-r--r-- | roles/openshift_master/files/atomic-openshift-master-controllers.service | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 7fd91e284..c445f28b7 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -5,6 +5,7 @@ masters nodes etcd +lb # Set variables common for all OSEv3 hosts [OSEv3:vars] @@ -70,6 +71,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_master_cluster_public_hostname=openshift-ansible.test.example.com #openshift_master_cluster_defer_ha=True +# Native clustering with haproxy as an optional load balancer +#openshift_master_cluster_hostname=openshift-ansible.test.example.com +#openshift_master_cluster_public_hostname=openshift-ansible.test.example.com +#openshift_master_cluster_vip=192.168.133.25 +#openshift_master_cluster_public_vip=192.168.133.25 + # default subdomain to use for exposed routes #osm_default_subdomain=apps.test.example.com @@ -108,9 +115,10 @@ ose3-master[1:3]-ansible.test.example.com [etcd] ose3-etcd[1:3]-ansible.test.example.com -# 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 -# make them unschedulable by adding openshift_scheduleable=False any node that's also a master. +[lb] +ose3-lb-ansible.test.example.com + +# host group for nodes [nodes] ose3-master[1:3]-ansible.test.example.com ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'primary', 'zone': 'default'}" diff --git a/roles/openshift_master/files/atomic-openshift-master-api.service b/roles/openshift_master/files/atomic-openshift-master-api.service index b24b9809e..4663b77f2 100644 --- a/roles/openshift_master/files/atomic-openshift-master-api.service +++ b/roles/openshift_master/files/atomic-openshift-master-api.service @@ -10,7 +10,7 @@ Requires=network.target Type=notify EnvironmentFile=/etc/sysconfig/atomic-openshift-master-api Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/atomic-enterprise start master api --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/openshift start master api --config=${CONFIG_FILE} $OPTIONS LimitNOFILE=131072 LimitCORE=infinity WorkingDirectory=/var/lib/origin/ diff --git a/roles/openshift_master/files/atomic-openshift-master-controllers.service b/roles/openshift_master/files/atomic-openshift-master-controllers.service index e84160e5a..517f9c908 100644 --- a/roles/openshift_master/files/atomic-openshift-master-controllers.service +++ b/roles/openshift_master/files/atomic-openshift-master-controllers.service @@ -10,7 +10,7 @@ Requires=network.target Type=notify EnvironmentFile=/etc/sysconfig/atomic-openshift-master-controllers Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/atomic-enterprise start master controllers --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS LimitNOFILE=131072 LimitCORE=infinity WorkingDirectory=/var/lib/origin/ |