Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2457 from abutcher/bz1370707 | Scott Dodson | 2016-09-16 | 1 | -0/+1 |
|\ | | | | | Add 'MaxGCEPDVolumeCount' to default scheduler predicates. | ||||
| * | Add 'MaxGCEPDVolumeCount' to default scheduler predicates. | Andrew Butcher | 2016-09-16 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #2453 from zeari/manageiq_allow_create_project | Andrew Butcher | 2016-09-16 | 1 | -0/+1 |
|\ \ | | | | | | | Add role to manageiq to allow creation of projects | ||||
| * | | Add role to manageiq to allow creation of projects | Ari Zellner | 2016-09-15 | 1 | -0/+1 |
| | | | |||||
* | | | Update README.md | Scott Dodson | 2016-09-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2447 from sdodson/branches | Scott Dodson | 2016-09-16 | 1 | -7/+11 |
|\ \ \ | | | | | | | | | Switch to origin-1.x branch names | ||||
| * | | | Switch to origin-1.x branch names | Scott Dodson | 2016-09-16 | 1 | -7/+11 |
| | | | | |||||
* | | | | Merge pull request #2420 from smunilla/BZ1336271 | Scott Dodson | 2016-09-16 | 1 | -2/+1 |
|\ \ \ \ | |_|_|/ |/| | | | a-o-i: Do not display version number in quick installer | ||||
| * | | | a-o-i: Do not display version number in quick installer | Samuel Munilla | 2016-09-08 | 1 | -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_ports | Scott Dodson | 2016-09-16 | 2 | -2/+10 |
|\ \ \ \ | | | | | | | | | | | Open ports for vxlan and Nuage monitor | ||||
| * | | | | Open ports for vxlan and Nuage monitor | Vishal Patil | 2016-09-16 | 2 | -2/+10 |
| | | | | | |||||
* | | | | | Merge pull request #2451 from smunilla/BZ1375946 | Scott Dodson | 2016-09-15 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | a-o-i: Don't set unschedulable nodes as infra | ||||
| * | | | | | a-o-i: Don't set unschedulable nodes as infra | Samuel Munilla | 2016-09-14 | 1 | -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-command | Scott Dodson | 2016-09-15 | 3 | -2/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Move delegated_serial_command to etcd_common. | ||||
| * | | | | | Move delegated_serial_command module to etcd_common. | Andrew Butcher | 2016-09-12 | 3 | -2/+0 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2452 from abutcher/max-ebs-volume-count | Scott Dodson | 2016-09-15 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add 'MaxEBSVolumeCount' to default scheduler predicates. | ||||
| * | | | | | Add 'MaxEBSVolumeCount' to default scheduler predicates. | Andrew Butcher | 2016-09-14 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2295 from dgoodwin/override-docker-upgrade | Scott Dodson | 2016-09-15 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Allow overriding the Docker 1.10 requirement for upgrade. | ||||
| * | | | | Allow overriding the Docker 1.10 requirement for upgrade. | Devan Goodwin | 2016-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Respect an explicit docker_version, and the use of docker_upgrade=False. | ||||
* | | | | | Merge pull request #2449 from abutcher/service-signer-upgrade | Scott Dodson | 2016-09-14 | 3 | -1/+102 |
|\ \ \ \ \ | | | | | | | | | | | | | [upgrade] Create/configure service signer cert when missing. | ||||
| * | | | | | [upgrade] Create/configure service signer cert when missing. | Andrew Butcher | 2016-09-14 | 3 | -1/+102 |
| | | | | | | |||||
* | | | | | | Merge pull request #2442 from bparees/quickstarts | Scott Dodson | 2016-09-14 | 6 | -1280/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | get quickstarts from origin, not upstream example repos | ||||
| * | | | | | | get quickstarts from origin, not upstream example repos | Ben Parees | 2016-09-14 | 6 | -1280/+22 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2450 from abutcher/issue2448 | Scott Dodson | 2016-09-14 | 1 | -1/+11 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | [redeploy-certificates] Correct etcd service name for containerized. | ||||
| * | | | | | [redeploy-certificates] Set default value for ↵ | Andrew Butcher | 2016-09-14 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | openshift_master_default_subdomain as workaround. | ||||
| * | | | | | [redeploy-certificates] Correct etcd service name. | Andrew Butcher | 2016-09-14 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #2443 from sdodson/bz1375031 | Andrew Butcher | 2016-09-13 | 1 | -0/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | Define proxy settings for node services | ||||
| * | | | | Define proxy settings for node services | Scott Dodson | 2016-09-13 | 1 | -0/+17 |
|/ / / / | |||||
* | | | | Merge pull request #2439 from abutcher/restart-openvswitch | Scott Dodson | 2016-09-12 | 1 | -2/+1 |
|\ \ \ \ | |_|/ / |/| | | | Check for use_openshift_sdn when restarting openvswitch. | ||||
| * | | | Check for use_openshift_sdn when restarting openvswitch. | Andrew Butcher | 2016-09-12 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge pull request #2440 from abutcher/readme-links | Scott Dodson | 2016-09-12 | 1 | -13/+13 |
|\ \ \ | | | | | | | | | Fix README links. | ||||
| * | | | Fix README links. | Andrew Butcher | 2016-09-12 | 1 | -13/+13 |
| | | | | |||||
* | | | | Merge pull request #2438 from abutcher/flannel-uninstall | Scott Dodson | 2016-09-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Check for is_atomic when uninstalling flannel package. | ||||
| * | | | | Check for is_atomic when uninstalling flannel package. | Andrew Butcher | 2016-09-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2429 from dgoodwin/openvswitch-restart-pause | Scott Dodson | 2016-09-12 | 1 | -0/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Pause after restarting openvswitch in containerized upgrade. | ||||
| * | | | | Pause after restarting openvswitch in containerized upgrade. | Devan Goodwin | 2016-09-12 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The openvswitch restart appears to hang the node container running briefly, if you try to restart node too quickly it will fail complaining that the node container name is still in use. Pausing after openvswitch restart allows the existing node container to catch up and then shutdown cleanly. | ||||
* | | | | | Merge pull request #2431 from elyscape/2430-always-dedupe-cert-names | Andrew Butcher | 2016-09-12 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Always deduplicate detected certificate names | ||||
| * | | | | Always deduplicate detected certificate names | Eli Young | 2016-09-09 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2432 from andrewklau/master | Scott Dodson | 2016-09-12 | 3 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Add acceptschema2 and enforcequota settings for hosted registry | ||||
| * | | | | Add acceptschema2 and enforcequota settings for hosted registry | Andrew Lau | 2016-09-10 | 3 | -0/+6 |
|/ / / / | |||||
* | | | | Merge pull request #2428 from abutcher/s3-rootdirectory | Scott Dodson | 2016-09-09 | 3 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | Bug 1367284 - rootdirectory configuration is hardcode when installer is using s3 as registry storage | ||||
| * | | | Add option for specifying s3 registry storage root directory. | Andrew Butcher | 2016-09-09 | 3 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #2425 from dgoodwin/flush-handlers | Scott Dodson | 2016-09-09 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Flush handlers before marking a node schedulable after upgrade. | ||||
| * | | | | Flush handlers before marking a node schedulable after upgrade. | Devan Goodwin | 2016-09-09 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Handlers normally only trigger at the end of the play, but in this case we just set our node schedulable again resulting in it immediately getting taken down again. | ||||
* | | | | Merge pull request #2427 from abutcher/BZ1298336 | Scott Dodson | 2016-09-09 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Bug 1298336 - Rerunning the installer fails when not in default namespace | ||||
| * | | | | Set config/namespace where missing for secure registry deployment. | Andrew Butcher | 2016-09-09 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge pull request #2422 from abutcher/manage-node-hostnames | Andrew Butcher | 2016-09-09 | 2 | -8/+4 |
|\ \ \ \ | | | | | | | | | | | Fix node label / schedulability when inventory_hostname != openshift.common.hostname | ||||
| * | | | | Iterate over node inventory hostnames instead of openshift.common.hostname ↵ | Andrew Butcher | 2016-09-08 | 2 | -8/+4 |
| |/ / / | | | | | | | | | | | | | within openshift_manage_node role. | ||||
* | | | | Merge pull request #2418 from sdodson/branches | Scott Dodson | 2016-09-08 | 1 | -0/+9 |
|\ \ \ \ | |_|_|/ |/| | | | Explain our branching strategy | ||||
| * | | | Explain our branching strategy | Scott Dodson | 2016-09-07 | 1 | -0/+9 |
| | | | |