summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove typos that got reintroducedSteve Milner2017-05-251-2/+2
|
* oc_atomic_container: Workaround for invalid json from atomic commandSteve Milner2017-05-252-2/+6
| | | | | | | | When no other containers are present and one attempts to list containers via the atomic command with the --json flag an empty string is returned. If a json.loads is used on this value an error is raised. This change adds a workaround to fall back to '[]' when an empty string is returned from the atomic containers command.
* Remove system-package=no from container-engine installSteve Milner2017-05-251-2/+0
|
* oc_atomic_container: Hard code system-package=noSteve Milner2017-05-252-2/+6
|
* Merge pull request #4242 from jarrpa/map-pairs-fixOpenShift Bot2017-05-242-2/+2
|\ | | | | Merged by openshift-bot
| * filter_plugins: Allow for multiple pairs in map_from_pairs()Jose A. Rivera2017-05-192-2/+2
| | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | Automatic commit of package [openshift-ansible] release [3.6.84-1].Jenkins CD Merge Bot2017-05-242-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.84
* | Merge pull request #4244 from jarrpa/oc_process-errOpenShift Bot2017-05-242-2/+2
|\ \ | | | | | | Merged by openshift-bot
| * | oc_process: Better error output on failed template() callJose A. Rivera2017-05-192-2/+2
| |/ | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | Automatic commit of package [openshift-ansible] release [3.6.83-1].Jenkins CD Merge Bot2017-05-242-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.83
* | Merge pull request #4257 from dmsimard/hostname_validationOpenShift Bot2017-05-241-1/+3
|\ \ | | | | | | Merged by openshift-bot
| * | Allow a hostname to resolve to 127.0.0.1 during validationDavid Moreau-Simard2017-05-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 127.0.0.1 does not end up in "ansible_all_ipv4_addresses" and should be considered valid. For example, a hostname could be resolving to a public address that is not bound to the actual server. Or the host could resolve to 127.0.0.1 from the perspective of the host since the hostname is set up in /etc/hosts.
* | | Automatic commit of package [openshift-ansible] release [3.6.82-1].Jenkins CD Merge Bot2017-05-242-2/+18
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.82
* | | Merge pull request #3509 from ewolinetz/logging_component_subrolesOpenShift Bot2017-05-2382-2207/+2075
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Fixing tux warnings and some final clean upewolinetz2017-05-234-29/+35
| | | |
| * | | Appease travisScott Dodson2017-05-222-6/+6
| | | |
| * | | Merge pull request #25 from stevekuznetsov/skuznets/scale-firstEric Wolinetz2017-05-228-40/+15
| |\ \ \ | | | | | | | | | | Add Kibana readiness probe, stop using `oc scale` for cluster start
| | * | | Add a readiness probe to the Kibana containerSteve Kuznetsov2017-05-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to ensure that the Kubernetes machinery can determine when the Kibana Pods are becoming ready, we need to add a readiness probe to the Containers that make up those pods. The Kibana readiness probe simply hits the base URL at `http://localhost:5601/` and expects a 200. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
| | * | | Create logging deployments with non-zero replica countsSteve Kuznetsov2017-05-228-40/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we currently create the set of logging `DeploymentConfig`s, we create them with zero desired replicas. This causes the deployment to immediately succeed as there is no work to be done. This inhibits our ability to use nice CLI UX features like `oc rollout status` to monitor the logging stack deployments. Instead, we should can create the configs with the correct number of replicas in the first place and stop using `oc scale` to bring them up after the fact. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
| * | | Pulling changes from master branchewolinetz2017-05-229-12/+63
| | | |
| * | | Adding some missing changesewolinetz2017-05-221-1/+3
| | | |
| * | | fixing available variables for 2.3.0ewolinetz2017-05-221-0/+8
| | | |
| * | | Updating pvc generation namesewolinetz2017-05-221-3/+20
| | | |
| * | | updating delete_logging to use modulesewolinetz2017-05-221-62/+47
| | | |
| * | | Pulling in changes from masterewolinetz2017-05-2262-2701/+484
| | | |
| * | | Decomposing openshift_logging role into subcomponent rolesewolinetz2017-05-2241-120/+2161
| | | |
* | | | Merge pull request #4263 from sosiouxme/20170522-fix-docker-test-flakeOpenShift Bot2017-05-231-0/+1
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | preflight int tests: fix test flakeLuke Meyer2017-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those tests spin up docker images and remove them at the end. The removal seems to fail randomly on test systems. Changed the removal task to ignore errors.
* | | | | Merge pull request #4230 from ozdanborne/fix-renameOpenShift Bot2017-05-232-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Fix renaming error with calico template filesDan Osborne2017-05-182-0/+0
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.80-1].Jenkins CD Merge Bot2017-05-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.80
* | | | | | Merge pull request #4079 from sosiouxme/20170503-move-check-playbookOpenShift Bot2017-05-2321-98/+141
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | RPM workaround for the move of cert playbooksPep Turró Mauri2017-05-221-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The playbooks/certificate_expiry directory is being moved inside the openshift-checks tree, and a symlink there is put in place for backwards compatibility. RPM does not handle this well, so this expands the section of the specfile that already contains a workaround for this situation to also handle this move.
| * | | | | | health check playbooks: relocate and expandLuke Meyer2017-05-2220-84/+121
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are moving toward having adhoc post-install checks and so the "preflight" designation needs to be widened. Updated location to playbooks/byo/openshift-checks, added health check playbook, and updated README. Also included the certificate_expiry playbooks. Left behind symlinks and wrappers for existing checks. To conform with the direction of the rest of the repo, the openshift-checks playbooks are split into two directories, one under playbooks/common with the actual invocation and one under playbooks/byo for entrypoints that are just wrappers for the ones in common. Because the certificate_expiry playbooks are intended not just to be functional but to be examples that users modify, I did not split them similarly. That could happen later after discussion but for now I just left them whole under byo/openshift-checks/certificate_expiry.
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.69-1].Scott Dodson2017-05-232-2/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag
* | | | | | Merge pull request #3785 from ↵OpenShift Bot2017-05-2312-118/+329
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | juanvallejo/jvallejo/update-docker-image-availability-check Merged by openshift-bot
| * | | | | | preflight int tests: fix for openshift_version depLuke Meyer2017-05-229-16/+76
| | | | | | |
| * | | | | | remove skopeo dependency on docker-pyjuanvallejo2017-05-192-152/+143
| | | | | | |
| * | | | | | improve error handling for missing varsjuanvallejo2017-05-193-66/+226
| | | | | | |
* | | | | | | Merge pull request #4248 from abutcher/sysctl-workaroundOpenShift Bot2017-05-232-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Workaround sysctl module issue with py3 by converting task to lineinfile.Andrew Butcher2017-05-192-1/+10
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #4243 from jarrpa/template-paramsOpenShift Bot2017-05-2228-28/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Merged by openshift-bot
| * | | | | | lib/base: Allow for more complex template paramsJose A. Rivera2017-05-1928-28/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows for the specification of JSON objects like lists as parameters to templates. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #3982 from jim-minter/trello131-broker-configurationOpenShift Bot2017-05-223-0/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Merged by openshift-bot
| * | | | | add template service broker configurableJim Minter2017-04-243-0/+15
| | | | | |
* | | | | | Merge pull request #4228 from etsauer/s3-required-varsScott Dodson2017-05-222-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removing requirement to pass aws credentials
| * | | | | | Removing requirement to pass aws credentialsEric Sauer2017-05-222-4/+4
| | | | | | |
* | | | | | | Merge pull request #4220 from pat2man/openshift_hosted_metrics_deployer_versionEric Wolinetz2017-05-222-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Update examples to include metrics deployer version
| * | | | | | Update hosts.*.example to include openshift_hosted_metrics_deployer_versionPatrick Tescher2017-05-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this we can have a mismatch between the OpenShift version and the metrics version. Fixes https://github.com/openshift/origin/issues/13532
* | | | | | | Merge pull request #4217 from ingvagabund/move-etcd-upgrade-code-into-roleJan Chaloupka2017-05-2122-198/+270
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move etcd upgrade code into role