summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
* | Merge pull request #2440 from abutcher/readme-linksScott Dodson2016-09-121-13/+13
|\ \ | | | | | | Fix README links.
| * | Fix README links.Andrew Butcher2016-09-121-13/+13
| | |
* | | Merge pull request #2438 from abutcher/flannel-uninstallScott Dodson2016-09-121-1/+1
|\ \ \ | | | | | | | | Check for is_atomic when uninstalling flannel package.
| * | | Check for is_atomic when uninstalling flannel package.Andrew Butcher2016-09-121-1/+1
| | | |
* | | | Merge pull request #2429 from dgoodwin/openvswitch-restart-pauseScott Dodson2016-09-121-0/+6
|\ \ \ \ | |_|/ / |/| | | Pause after restarting openvswitch in containerized upgrade.
| * | | Pause after restarting openvswitch in containerized upgrade.Devan Goodwin2016-09-121-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-namesAndrew Butcher2016-09-121-1/+1
|\ \ \ \ | |_|/ / |/| | | Always deduplicate detected certificate names
| * | | Always deduplicate detected certificate namesEli Young2016-09-091-1/+1
| |/ /
* | | Merge pull request #2432 from andrewklau/masterScott Dodson2016-09-123-0/+6
|\ \ \ | | | | | | | | Add acceptschema2 and enforcequota settings for hosted registry
| * | | Add acceptschema2 and enforcequota settings for hosted registryAndrew Lau2016-09-103-0/+6
|/ / /
* | | Merge pull request #2428 from abutcher/s3-rootdirectoryScott Dodson2016-09-093-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 Butcher2016-09-093-1/+3
| | |
* | | Merge pull request #2425 from dgoodwin/flush-handlersScott Dodson2016-09-091-0/+2
|\ \ \ | | | | | | | | Flush handlers before marking a node schedulable after upgrade.
| * | | Flush handlers before marking a node schedulable after upgrade.Devan Goodwin2016-09-091-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/BZ1298336Scott Dodson2016-09-091-0/+4
|\ \ \ | | | | | | | | Bug 1298336 - Rerunning the installer fails when not in default namespace
| * | | Set config/namespace where missing for secure registry deployment.Andrew Butcher2016-09-091-0/+4
| |/ /
* | | Merge pull request #2422 from abutcher/manage-node-hostnamesAndrew Butcher2016-09-092-8/+4
|\ \ \ | | | | | | | | Fix node label / schedulability when inventory_hostname != openshift.common.hostname
| * | | Iterate over node inventory hostnames instead of openshift.common.hostname ↵Andrew Butcher2016-09-082-8/+4
| |/ / | | | | | | | | | within openshift_manage_node role.
* | | Merge pull request #2418 from sdodson/branchesScott Dodson2016-09-081-0/+9
|\ \ \ | | | | | | | | Explain our branching strategy
| * | | Explain our branching strategyScott Dodson2016-09-071-0/+9
| | | |
* | | | Merge pull request #2398 from mkumatag/fix_warningsScott Dodson2016-09-083-6/+17
|\ \ \ \ | |_|/ / |/| | | Fix warnings
| * | | Fix warningsManjunath A Kumatagi2016-09-073-6/+17
| | | |
* | | | Merge pull request #2417 from abutcher/manage-node-kubeconfigAndrew Butcher2016-09-072-8/+33
|\ \ \ \ | | | | | | | | | | Bug 1327409 - scaleup playbook uses current oc login which may not have enough permissions
| * | | | Don't loop over hostvars when setting node schedulability.Andrew Butcher2016-09-072-7/+6
| | | | |
| * | | | Copy admin kubeconfig in openshift_manage_node role.Andrew Butcher2016-09-071-1/+27
|/ / / /
* | | | Merge pull request #2413 from tbielawa/GH2401_PersistentVolumesJason DeTiberus2016-09-071-1/+4
|\ \ \ \ | |_|/ / |/| | | Fix for objects which can't be converted by the YAML parser
| * | | Adjust to_padded_yaml transformation to use the AnsibleDumperTim Bielawa2016-09-071-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | * Previously we used yaml.safe_dump * Now we use yamp.dump with the `Dumper` parameter set to the AnsibleDumper class. * AnsibleDumper subclasses yaml.SafeDumper, so we aren't losing any safety nets
* | | Merge pull request #2409 from abutcher/secure-registryScott Dodson2016-09-045-13/+213
|\ \ \ | | | | | | | | Secure registry for atomic registry deployment
| * | | Secure registry for atomic registry deployment (deployment_subtype=registry).Andrew Butcher2016-09-025-13/+213
| | | |
* | | | Merge pull request #2405 from tbielawa/FixFilterErrorStringSubstitutionTim Bielawa2016-09-021-1/+1
|\ \ \ \ | | | | | | | | | | Fix string substitution error in the to_padded_yaml filter
| * | | | Fix string substitution error in the to_padded_yaml filterTim Bielawa2016-09-021-1/+1
| | | | |
* | | | | Merge pull request #2406 from sdodson/record-schedulabilityScott Dodson2016-09-021-1/+13
|\ \ \ \ \ | | | | | | | | | | | | Record schedulability of node prior to upgrade and re-set it to that
| * | | | | Record schedulability of node prior to upgrade and re-set it to thatScott Dodson2016-09-021-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were setting schedulability to the state defined in the inventory without regard to whether or not it was manually made schedulable or unschedulable. The right thing seems to be to record the state prior to upgrade and set it back.
* | | | | | Merge pull request #2402 from sdodson/image-stream-syncScott Dodson2016-09-029-314/+254
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update image stream data
| * | | | | Update image stream dataScott Dodson2016-09-029-314/+254
| |/ / / /
* | | | | Merge pull request #2202 from richm/logging-1.3Scott Dodson2016-09-023-33/+122
|\ \ \ \ \ | |/ / / / |/| | | | initial support for v1.3 with logging v1.3
| * | | | initial support for v1.3 with logging v1.3Rich Megginson2016-09-013-33/+122
| | |/ / | |/| | | | | | | | | | | | | | | | | | This also includes some fixes to make deploying logging more idempotent, such as ignoring failures if trying to create objects that already exist