Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1237 from detiber/infra_fixes | Brenton Leanhardt | 2016-02-01 | 10 | -75/+151 |
|\ | | | | | infra_node fixes | ||||
| * | Added docs around oo_nodes_with_label | Jason DeTiberus | 2016-02-01 | 1 | -49/+75 |
| | | |||||
| * | fix for terminate | Jason DeTiberus | 2016-02-01 | 1 | -1/+1 |
| | | |||||
| * | Fix node tags for aws provider | Jason DeTiberus | 2016-02-01 | 1 | -1/+1 |
| | | |||||
| * | use yaml for loading lable info instead of json | Jason DeTiberus | 2016-02-01 | 1 | -1/+1 |
| | | |||||
| * | infra_node fixes | Jason DeTiberus | 2016-02-01 | 9 | -30/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - openshift_master role update - infra_nodes was previously being set to num_infra, which is an integer value when using the cloud providers, added a new variable osm_infra_nodes that is expected to be a list of hosts - if openshift_infra_nodes is not already set, create it from the nodes that have the region=infra label. - Cloud provider config playbook updates - override openshift_router_selector for cloud providers to avoid using the default of 'region=infra' when deployment_type is not 'online' - Set openshift_infra_nodes to g_infra_host for cloud providers | ||||
* | | Merge pull request #1316 from mwoodson/master_local | Matt Woodson | 2016-02-01 | 1 | -2/+25 |
|\ \ | | | | | | | zabbix: added master local api items and triggers | ||||
| * | | zabbix: added master local api items and triggers | Matt Woodson | 2016-02-01 | 1 | -2/+25 |
| | | | |||||
* | | | Merge pull request #1304 from jprovaznik/sleep | Brenton Leanhardt | 2016-02-01 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Give openvswitch container some time to start | ||||
| * | | Give openvswitch container some time to start | Jan Provaznik | 2016-01-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | It's possible that openshift containers are started sooner than openvswitch starts/sets networking (this typically happens when docker service is restarted). | ||||
* | | | Merge pull request #1311 from sdodson/is-sync | Brenton Leanhardt | 2016-02-01 | 5 | -109/+123 |
|\ \ \ | |_|/ |/| | | Sync latest imagestreams | ||||
| * | | Fix missing bool filter | Scott Dodson | 2016-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Sync platest imagestreams | Scott Dodson | 2016-01-29 | 4 | -108/+122 |
| | | | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.0.37-1]. | Kenny Woodson | 2016-01-29 | 2 | -2/+36 |
| | | | |||||
* | | | Merge pull request #1313 from kwoodson/ohi_ips | Kenny Woodson | 2016-01-29 | 4 | -16/+52 |
|\ \ \ | | | | | | | | | ohi supports ip now. | ||||
| * | | | Adding ip address option | Kenny Woodson | 2016-01-29 | 4 | -16/+52 |
| |/ / | |||||
* | | | Merge pull request #1114 from lhuard1A/fix_update_repos_and_packages | Brenton Leanhardt | 2016-01-29 | 3 | -2/+4 |
|\ \ \ | | | | | | | | | Fix update_repos_and_packages playbook which now needs openshift_facts | ||||
| * | | | Move the `is_atomic` check from `update_repos_and_packages.yml` to ↵ | Lénaïc Huard | 2016-01-12 | 3 | -2/+4 |
| | | | | | | | | | | | | | | | | `rhel_subscribe` | ||||
* | | | | Merge pull request #1133 from lhuard1A/increase_openstack_timeout | Brenton Leanhardt | 2016-01-29 | 2 | -2/+3 |
|\ \ \ \ | |_|/ / |/| | | | Increase OpenStack stack creation/deletion timeout | ||||
| * | | | Increase OpenStack stack creation/deletion timeout | Lénaïc Huard | 2016-01-08 | 2 | -2/+3 |
| | | | | |||||
* | | | | Merge pull request #1300 from vishpat/bug1298 | Brenton Leanhardt | 2016-01-29 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Fix for bug 1298 | ||||
| * | | | | Fix for bug 1298 | Vishal Patil | 2016-01-28 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1307 from abutcher/containerized-cockpit | Brenton Leanhardt | 2016-01-29 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Enable cockpit when not is_atomic. | ||||
| * | | | | Enable cockpit when not is_atomic. | Andrew Butcher | 2016-01-29 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1301 from vishpat/bug1299 | Brenton Leanhardt | 2016-01-29 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | Explicitly restart the node service after configuring it for nuage | ||||
| * | | | Explicitly restart the atomic node service after configuring it for nuage | Vishal Patil | 2016-01-28 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #1264 from gaelL/s3_registry_template | Stefanie Forrester | 2016-01-28 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | adhoc s3 registry - add auth part in the registry config sample | ||||
| * | | | adhoc s3 registry - add auth part in the registry config sample | gaelL | 2016-01-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the auth part, after spawning the registry we were not able to do an auth. ``` docker login -u .. -p ... 172.30.234.98:5000 Error response from daemon: no successful auth challenge forhttp://172.30.234.98:5000/v2/ - errors: [] ``` Simply adding this part in the registry config sample | ||||
* | | | | Merge pull request #1265 from talset/s3_registry_clusterid | Stefanie Forrester | 2016-01-28 | 2 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | Allow to have custom bucket name and region | ||||
| * | | | | Allow to have custom bucket name and region | talset | 2016-01-28 | 2 | -4/+6 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File playbooks/adhoc/s3_registry/s3_registry* To be able to use a different bucket name and region, aws_bucket and aws_region are now available * Add variable for region and bucket into j2 * Update comment Usage * Add default aws_bucket_name and aws_bucket_region | ||||
* | | | | Merge pull request #1288 from abutcher/container-logrotate | Brenton Leanhardt | 2016-01-28 | 7 | -3/+13 |
|\ \ \ \ | | | | | | | | | | | Configure logrotate on atomic. | ||||
| * | | | | Add inventory example for logrotate_scripts | Andrew Butcher | 2016-01-28 | 3 | -0/+12 |
| | | | | | |||||
| * | | | | Configure logrotate on atomic. | Andrew Butcher | 2016-01-27 | 4 | -3/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1294 from kwoodson/yaml_fix | Kenny Woodson | 2016-01-28 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed logic for skipping symlinks in jenkins checks. | ||||
| * | | | | | fixing logic for skipping symlinks | Kenny Woodson | 2016-01-28 | 1 | -1/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #1290 from joelddiaz/sky-template | Joel Diaz | 2016-01-28 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | fix template trigger calc | ||||
| * | | | | | fix template trigger calc | Joel Diaz | 2016-01-28 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #1292 from brenton/master | Brenton Leanhardt | 2016-01-28 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Minor readme cleanup for Bug 1271566 | ||||
| * | | | | Minor readme cleanup for Bug 1271566 | Brenton Leanhardt | 2016-01-28 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1286 from kwoodson/zbx_host_fix | Kenny Woodson | 2016-01-26 | 1 | -1/+20 |
|\ \ \ \ | | | | | | | | | | | Fixed zbx_host interface comparison and removed duplicate hostgroup names for input. | ||||
| * | | | | Comparing zbx_host interfaces and removing duplicate hostgroup_names | Kenny Woodson | 2016-01-26 | 1 | -1/+20 |
| | | | | | |||||
* | | | | | Merge pull request #1273 from lhuard1A/fix_oo_pretty_print_cluster | Thomas Wiest | 2016-01-26 | 1 | -19/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix `oo_pretty_print_cluster` following the renaming of `env` into `clusterid` | ||||
| * | | | | | Fix oo_pretty_print_cluster following the renaming of `env` into `clusterid` | Lénaïc Huard | 2016-01-26 | 1 | -19/+21 |
| | | | | | | |||||
* | | | | | | Merge pull request #1274 from rassie/patch-1 | Brenton Leanhardt | 2016-01-26 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix checking for update package availability | ||||
| * | | | | | | Fix checking for update package availability | Nikolai Prokoschenko | 2016-01-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if `yum list available` returns two versions, for whatever reason, no sorting is imposed. Therefore it's possible that an upgraded package version is available but is not being detected. This patch sorts the version number list so that most recent version is always picked first. | ||||
* | | | | | | | Merge pull request #1283 from giuseppe/giuseppe/Dockerfile-require-pyOpenSSL | Brenton Leanhardt | 2016-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Dockerfile: Require pyOpenSSL | ||||
| * | | | | | | | Dockerfile: Require pyOpenSSL | Giuseppe Scrivano | 2016-01-26 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | | | Merge pull request #1280 from sjenning/replace-yum-dnf | Brenton Leanhardt | 2016-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | replace yum with dnf | ||||
| * | | | | | | | replace yum with dnf | Seth Jennings | 2016-01-26 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1279 from abutcher/is-atomic-swap | Brenton Leanhardt | 2016-01-26 | 6 | -9/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Install cockpit, logrotate and fluentd unless host is atomic. |