summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3535 from enj/enj/f/reserve_ns_moduleScott Dodson2017-03-068-578/+1051
|\ | | | | Add pre-upgrade check for reserved namespaces
| * Make generic OCObjectValidator from OCSDNValidatorMonis Khan2017-03-068-578/+1051
|/ | | | Signed-off-by: Monis Khan <mkhan@redhat.com>
* Merge pull request #3567 from richm/logging-needs-openshift_master_factsScott Dodson2017-03-061-0/+1
|\ | | | | logging needs openshift_master_facts before openshift_facts
| * logging needs openshift_master_facts before openshift_factsRich Megginson2017-03-061-0/+1
| |
* | Merge pull request #3382 from codificat/playbook2imageScott Dodson2017-03-065-20/+105
|\ \ | |/ |/| Dockerfile and docs to run containerized playbooks
| * Dockerfile and docs to run containerized playbooksPep Turró Mauri2017-03-065-20/+105
| | | | | | | | | | | | | | | | Update openshift-ansible's Dockerfile to use playbook2image as a base, with the goal to run an arbitrary playbook from a container. The existing Dockerfile is moved to Dockerfile.rhel7 for the productized version and will be updated to use playbook2image later.
* | Merge pull request #3566 from detiber/testConfigsJason DeTiberus2017-03-064-28/+23
|\ \ | |/ |/| separate out test tool configs from setup.cfg
| * separate out test tool configs from setup.cfgJason DeTiberus2017-03-064-28/+23
| | | | | | | | | | Since we are moving away from setuptools for invoking tests, lets move the configs for the different test tools into their own configs.
* | Merge pull request #3549 from kwoodson/router_shardingScott Dodson2017-03-062-61/+54
|\ \ | | | | | | Adding support for multiple router shards.
| * | Added ports.Kenny Woodson2017-03-022-0/+6
| | |
| * | Fixed router name to produce 2nd router.Kenny Woodson2017-03-021-1/+1
| | |
| * | Updated to work with an array of routers.Kenny Woodson2017-03-022-61/+19
| | |
| * | Adding support for router sharding.Kenny Woodson2017-03-022-61/+90
| | |
* | | Merge pull request #3325 from kwoodson/oc_projectKenny Woodson2017-03-069-1/+2280
|\ \ \ | |_|/ |/| | Adding oc_project to lib_openshift.
| * | Lower test coverage percentage.Kenny Woodson2017-03-061-1/+1
| | |
| * | Mock runs differntly on travis. Fix the mock test params to be ANY.Kenny Woodson2017-03-061-3/+2
| | |
| * | Fixed the none namespace. Fixed tests with latest loc_oc_binary call.Kenny Woodson2017-03-063-5/+10
| | |
| * | Updating the namespace param to None.Kenny Woodson2017-03-062-2/+2
| | |
| * | Regenerated code with latest yedit changes.Kenny Woodson2017-03-061-4/+11
| | |
| * | Fixed tests to align with new naming.Kenny Woodson2017-03-061-1/+1
| | |
| * | Fixed docs. Added check for delete failures. Updated namespace to None.Kenny Woodson2017-03-063-49/+144
| | |
| * | Fixing lintersKenny Woodson2017-03-063-4/+3
| | |
| * | Adding integration test. Fixed issue with node_selector.Kenny Woodson2017-03-063-8/+97
| | |
| * | Adding oc_project to lib_openshift.Kenny Woodson2017-03-067-0/+2085
| | |
* | | Merge pull request #3563 from rhcarvalho/misc-cleanupRodolfo Carvalho2017-03-069-140/+48
|\ \ \ | |/ / |/| | Misc cleanup
| * | Remove old commented-out testsRodolfo Carvalho2017-03-061-91/+0
| | |
| * | Remove redundant assertionRodolfo Carvalho2017-03-061-2/+0
| | | | | | | | | | | | | | | | | | That line is testing Python's list.count method, instead of yedit. The assertion right above is a superset of it, as it checks for equality to some expected value.
| * | Fix testRodolfo Carvalho2017-03-061-7/+1
| | | | | | | | | | | | | | | | | | | | | Instead of checking if a string is True, check if 'found' is True, the string is the error message. Also, we can remove the loop and use the simpler Python 'in' construct.
| * | Lint utils/testRodolfo Carvalho2017-03-064-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not use `print` in unit tests, send messages through the test framework instead. - Remove unused import. - Add spaces around equal sign in assigment. - Turn method into a function. - Reorganize imports according to PEP8.
| * | Rewrap long linesRodolfo Carvalho2017-03-062-8/+22
| | |
| * | Remove unused argumentRodolfo Carvalho2017-03-061-1/+1
| | | | | | | | | | | | Detected by pylint. The fixture indeed doesn't require an argument.
| * | Remove unused Makefile variablesRodolfo Carvalho2017-03-061-5/+0
|/ /
* | Merge pull request #3556 from dcbw/sdn-preserve-var-lib-cniScott Dodson2017-03-032-2/+2
|\ \ | | | | | | node/sdn: make /var/lib/cni persistent to ensure IPAM allocations stick around across node restart
| * | node/sdn: make /var/lib/cni persistent to ensure IPAM allocations stick ↵Dan Williams2017-03-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around across node restart With the move to a CNI plugin, docker no longer handles IPAM, but CNI does through openshift-sdn's usage of the 'host-local' CNI IPAM plugin. That plugin stores IPAM allocations under /var/lib/cni/. If the node container gets restarted, without presreving /var/lib/cni, the IPs currently allocated to running pods get lost and on restart, openshift-sdn may allocate those IPs to new pods causing duplicate allocations. This never happened with docker because it has its own persistent IPAM store that does not get removed when docker restarts. Also because (historically) when docker restarted, all the containers died and the IP allocations were released by the daemon. Fix this by ensuring that IPAM allocations (which are tied to the life of the pod, *not* the life of the openshift-node process) persist even if the openshift-node process restarts. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1427789
* | | Merge pull request #3499 from sdodson/1422348Scott Dodson2017-03-037-29/+20
|\ \ \ | |/ / |/| | Don't install python-ruamel-yaml
| * | BZ1422348 - Don't install python-ruamel-yamlScott Dodson2017-03-035-25/+2
| | | | | | | | | | | | Just rely on PyYAML as a fallback and hope that's there
| * | Re-generate modulesScott Dodson2017-03-032-4/+18
|/ /
* | Merge pull request #3527 from joelddiaz/yedit-path-exceptionsKenny Woodson2017-03-0320-39/+191
|\ \ | | | | | | raise exceptions when walking through object path
| * | regenerate lib_openshift with yedit exception changesJoel Diaz2017-02-2817-34/+153
| | |
| * | raise exceptions when walking through object pathJoel Diaz2017-02-283-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we're given path a.b.c and the existing object is: a: b: - item1 raise an exception due to unexpected objects found while traversing the path (ie. b is a list, not a dict) also, add_entry assumes new dicts for each sub element when creating elements besides the final assignment value. doing something like a.b.c[0] = 12 where 'c' doesn't exist raises an exception add test cases to cover: access path that differs from existing object create new objects with an embedded list in the path create new object with a list at the end (define the end list in the passed in 'value' to avoid this exception)
* | | Merge pull request #3550 from ewolinetz/logging_update_metaScott Dodson2017-03-031-1/+0
|\ \ \ | | | | | | | | Removing the openshift_master_facts dependency
| * | | Removing the openshift_master_facts dependencyewolinetz2017-03-021-1/+0
| | | |
* | | | Merge pull request #3551 from sdodson/BZ1428532Scott Dodson2017-03-031-1/+8
|\ \ \ \ | |_|_|/ |/| | | Only set ownership to etcd for thirdparty datadir
| * | | Only set ownership to etcd for thirdparty datadirScott Dodson2017-03-021-1/+8
| |/ / | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1428532
* | | Merge pull request #3548 from jcantrill/bz_1420256_again_reset_pvc_factsScott Dodson2017-03-022-18/+23
|\ \ \ | | | | | | | | bug 1420256. Initialize openshift_logging pvc_facts to empty
| * | | bug 1420256. Initialize openshift_logging pvc_facts to emptyJeff Cantrill2017-03-022-18/+23
| | | |
* | | | Merge pull request #3538 from mtnbikenc/bugfix-hosted-registryScott Dodson2017-03-021-1/+9
|\ \ \ \ | |_|/ / |/| | | Correct config for hosted registry
| * | | Add oc_adm_policy_user task cluster-role policyRussell Teague2017-03-021-0/+7
| | | |
| * | | Correct config for hosted registryRussell Teague2017-03-021-1/+2
|/ / /
* | | Merge pull request #3547 from jupierce/oadm_policy_group_patchScott Dodson2017-03-024-4/+4
|\ \ \ | | | | | | | | Fixing checkout for bindings with -binding suffix