summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2486 from sdodson/metrics-public-urlScott Dodson2016-09-212-0/+4
|\ | | | | Clarify openshift_hosted_metrics_public_url
| * Clarify openshift_hosted_metrics_public_urlScott Dodson2016-09-212-0/+4
|/ | | | | | Currently, metrics only works at /hawkular/metrics so if you alter the path portion of the variable then the master will direct traffic at an endpoint that won't work.
* Merge pull request #2485 from yaacov/add-documentation-on-metrics-hostnameScott Dodson2016-09-211-0/+1
|\ | | | | Add documentation about the openshift_hosted_metrics_public_url option
| * add documentation about the openshift_hosted_metrics_public_url optionyaacov2016-09-211-0/+1
|/
* Merge pull request #2476 from sdodson/split_builddefaults_no_proxyScott Dodson2016-09-201-0/+3
|\ | | | | Split openshift_builddefaults_no_proxy if it's not a list
| * Split openshift_builddefaults_no_proxy if it's not a listScott Dodson2016-09-201-0/+3
| |
* | Merge pull request #2474 from sdodson/node-no-proxy-v2Scott Dodson2016-09-201-1/+1
|\| | | | | Fix references to openshift.master.sdn_cluster_network_cidr in node r…
| * Fix references to openshift.master.sdn_cluster_network_cidr in node rolesScott Dodson2016-09-201-1/+1
|/
* Merge pull request #2472 from nak3/spec-licenseScott Dodson2016-09-202-13/+4
|\ | | | | move LICENSE to /usr/share/licenses/openshift-ansible-VERSION/
| * move LICENSE to /usr/share/licenses/openshift-ansible-VERSION/Kenjiro Nakayama2016-09-202-13/+4
|/
* Merge pull request #2470 from abutcher/issue2460Scott Dodson2016-09-191-28/+41
|\ | | | | [uninstall] Stop services on all hosts prior to removing files.
| * [uninstall] Stop services on all hosts prior to removing files.Andrew Butcher2016-09-191-28/+41
| |
* | Merge pull request #2467 from abutcher/issue2464Scott Dodson2016-09-191-7/+8
|\ \ | |/ |/| Do not create volume claims for hosted components when storage type is object.
| * Do not create volume claims for hosted components when storage type is object.Andrew Butcher2016-09-191-7/+8
| |
* | Merge pull request #2466 from sdodson/node-no-proxy-v2Scott Dodson2016-09-191-1/+1
|\ \ | | | | | | Add portal_net and sdn_cluster_network_cidr to node NO_PROXY
| * | Add portal_net and sdn_cluster_network_cidr to node NO_PROXYScott Dodson2016-09-191-1/+1
| | |
* | | Merge pull request #2461 from andrewklau/uninstallScott Dodson2016-09-191-1/+2
|\ \ \ | | | | | | | | Add origin-node.service.wants to uninstall
| * | | Add origin-node.service.wants to uninstallAndrew Lau2016-09-171-1/+2
| | |/ | |/|
* | | Merge pull request #2433 from andrewklau/tuned-atomic-guestScott Dodson2016-09-191-0/+4
|\ \ \ | |/ / |/| | Add atomic-guest tuned profile
| * | Add atomic-guest tuned profileAndrew Lau2016-09-131-0/+4
| | |
* | | Merge pull request #2457 from abutcher/bz1370707Scott Dodson2016-09-161-0/+1
|\ \ \ | | | | | | | | Add 'MaxGCEPDVolumeCount' to default scheduler predicates.
| * | | Add 'MaxGCEPDVolumeCount' to default scheduler predicates.Andrew Butcher2016-09-161-0/+1
| | | |
* | | | Merge pull request #2453 from zeari/manageiq_allow_create_projectAndrew Butcher2016-09-161-0/+1
|\ \ \ \ | | | | | | | | | | Add role to manageiq to allow creation of projects
| * | | | Add role to manageiq to allow creation of projectsAri Zellner2016-09-151-0/+1
| | | | |
* | | | | Update README.mdScott Dodson2016-09-161-1/+1
| | | | |
* | | | | Merge pull request #2447 from sdodson/branchesScott Dodson2016-09-161-7/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | Switch to origin-1.x branch names
| * | | | Switch to origin-1.x branch namesScott Dodson2016-09-161-7/+11
| | | | |
* | | | | Merge pull request #2420 from smunilla/BZ1336271Scott Dodson2016-09-161-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | a-o-i: Do not display version number in quick installer
| * | | | a-o-i: Do not display version number in quick installerSamuel Munilla2016-09-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we now require the version of the installer to match what will be installed in the target environment and to avoid any potential confusion, remove the version number from the variant choice question.
* | | | | Merge pull request #2456 from vishpat/nuage_portsScott Dodson2016-09-162-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Open ports for vxlan and Nuage monitor
| * | | | | Open ports for vxlan and Nuage monitorVishal Patil2016-09-162-2/+10
| | | | | |
* | | | | | Merge pull request #2451 from smunilla/BZ1375946Scott Dodson2016-09-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | a-o-i: Don't set unschedulable nodes as infra
| * | | | | | a-o-i: Don't set unschedulable nodes as infraSamuel Munilla2016-09-141-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we don't set an unschedulable node as infra as that can cause problems. Fixes: Bug 1375946
* | | | | | Merge pull request #2437 from abutcher/delegated-serial-commandScott Dodson2016-09-153-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move delegated_serial_command to etcd_common.
| * | | | | | Move delegated_serial_command module to etcd_common.Andrew Butcher2016-09-123-2/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2452 from abutcher/max-ebs-volume-countScott Dodson2016-09-151-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add 'MaxEBSVolumeCount' to default scheduler predicates.
| * | | | | | Add 'MaxEBSVolumeCount' to default scheduler predicates.Andrew Butcher2016-09-141-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2295 from dgoodwin/override-docker-upgradeScott Dodson2016-09-151-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow overriding the Docker 1.10 requirement for upgrade.
| * | | | | Allow overriding the Docker 1.10 requirement for upgrade.Devan Goodwin2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Respect an explicit docker_version, and the use of docker_upgrade=False.
* | | | | | Merge pull request #2449 from abutcher/service-signer-upgradeScott Dodson2016-09-143-1/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | [upgrade] Create/configure service signer cert when missing.
| * | | | | | [upgrade] Create/configure service signer cert when missing.Andrew Butcher2016-09-143-1/+102
| | | | | | |
* | | | | | | Merge pull request #2442 from bparees/quickstartsScott Dodson2016-09-146-1280/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | get quickstarts from origin, not upstream example repos
| * | | | | | | get quickstarts from origin, not upstream example reposBen Parees2016-09-146-1280/+22
| |/ / / / / /
* | | | | | | Merge pull request #2450 from abutcher/issue2448Scott Dodson2016-09-141-1/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [redeploy-certificates] Correct etcd service name for containerized.
| * | | | | | [redeploy-certificates] Set default value for ↵Andrew Butcher2016-09-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_master_default_subdomain as workaround.
| * | | | | | [redeploy-certificates] Correct etcd service name.Andrew Butcher2016-09-141-1/+3
| |/ / / / /
* | | | | | Merge pull request #2443 from sdodson/bz1375031Andrew Butcher2016-09-131-0/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Define proxy settings for node services
| * | | | | Define proxy settings for node servicesScott Dodson2016-09-131-0/+17
|/ / / / /
* | | | | Merge pull request #2439 from abutcher/restart-openvswitchScott Dodson2016-09-121-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Check for use_openshift_sdn when restarting openvswitch.
| * | | | Check for use_openshift_sdn when restarting openvswitch.Andrew Butcher2016-09-121-2/+1
|/ / / /