Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1628 from abutcher/deployment-type | Kenny Woodson | 2016-03-16 | 1 | -1/+2 |
|\ | | | | | Add default deployment_type to openshift_facts. | ||||
| * | Fall back to deployment_type in openshift_facts. | Andrew Butcher | 2016-03-16 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #1629 from kwoodson/docker_fix | Kenny Woodson | 2016-03-16 | 1 | -4/+4 |
|\ \ | | | | | | | Fix for docker role when variables are undefined. | ||||
| * | | Fixing undefined variable check | Kenny Woodson | 2016-03-16 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #1624 from sdodson/bz1317975 | Brenton Leanhardt | 2016-03-16 | 4 | -4/+4 |
|\ \ \ | | | | | | | | | Load environment files in containerized installs | ||||
| * | | | Load environment files in containerized installs | Scott Dodson | 2016-03-16 | 4 | -4/+4 |
| |/ / | |||||
* | | | Merge pull request #1620 from BlueShells/BuildappMonitor | Kenny Woodson | 2016-03-16 | 2 | -51/+51 |
|\ \ \ | |/ / |/| | | change type to value_type | ||||
| * | | change type to value_type | zhizhang | 2016-03-16 | 2 | -51/+51 |
| | | | |||||
* | | | Merge pull request #1617 from BlueShells/BuildappMonitor | Kenny Woodson | 2016-03-16 | 1 | -2/+2 |
|\| | | | | | | | | change time from int to float | ||||
| * | | change time from int to float | zhizhang | 2016-03-16 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1606 from BlueShells/BuildappMonitor | Kenny Woodson | 2016-03-16 | 1 | -0/+33 |
|\| | | |/ |/| | Buildapp monitor | ||||
| * | change the check time from 1 hour to 2 hour | zhizhang | 2016-03-16 | 1 | -2/+2 |
| | | |||||
| * | add item of time cost a app build and app create | zhizhang | 2016-02-29 | 1 | -0/+12 |
| | | |||||
| * | add trigger for app creation with build process | zhizhang | 2016-02-25 | 1 | -0/+15 |
| | | |||||
| * | add key of openshift.master.app.build.create | zhizhang | 2016-02-24 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #1613 from sdodson/bz1317734 | Brenton Leanhardt | 2016-03-16 | 1 | -1/+5 |
|\ \ | | | | | | | Only mask etcd service for containerized installls when it's installed | ||||
| * | | Only mask etcd service for containerized installls when it's installed | Scott Dodson | 2016-03-15 | 1 | -1/+5 |
| | | | |||||
* | | | Provide cacert when performing health checks | Andrew Butcher | 2016-03-15 | 3 | -3/+6 |
|/ / | |||||
* | | Merge pull request #1604 from enoodle/nfs_yum_to_pkg_manager | Brenton Leanhardt | 2016-03-15 | 1 | -3/+1 |
|\ \ | | | | | | | nfs: replace yum with dnf | ||||
| * | | nfs: replace yum with dnf | Erez Freiberger | 2016-03-15 | 1 | -3/+1 |
| | | | |||||
* | | | Merge pull request #1603 from detiber/move_common_common_facts | Brenton Leanhardt | 2016-03-15 | 7 | -15/+11 |
|\ \ \ | |/ / |/| | | Move common common facts to openshift_facts | ||||
| * | | Move common common facts to openshift_facts | Jason DeTiberus | 2016-03-15 | 7 | -15/+11 |
| | | | | | | | | | | | | | | | | | | | | | - Prevents roles that need common facts from needing to require openshift_common, which pulls in the openshift binary. - Add dependency on openshift_facts to os_firewall, since it uses openshift.common facts | ||||
* | | | Merge pull request #1600 from sdodson/docker182 | Brenton Leanhardt | 2016-03-15 | 1 | -1/+25 |
|\ \ \ | | | | | | | | | OSE/Origin < 3.2/1.2 should not get Docker 1.9 | ||||
| * | | | OSE/Origin < 3.2/1.2 should not get Docker 1.9 | Scott Dodson | 2016-03-14 | 1 | -1/+25 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RHEL and Centos docker-1.9 RPMs will have a Conflicts for origin and atomic-openshift < 3.2. If we left yum to its own devices we'd get a mess when trying to install once these packages land in the repos. So avoid installing docker-1.9 on Origin/OSE < 1.2/3.2. See: https://bugzilla.redhat.com/show_bug.cgi?id=1304038 Fedora doesn't keep old packages in repos so we just get the latest there. Docker 1.10 should be fine if and when it becomes available. | ||||
* / / | perform oc client config tasks only once when ansible_ssh_user is root | Jason DeTiberus | 2016-03-15 | 1 | -9/+6 |
|/ / | |||||
* | | Merge pull request #1594 from kwoodson/lib_openshift_api | Kenny Woodson | 2016-03-14 | 1 | -0/+379 |
|\ \ | | | | | | | First attempt at openshift api secrets module | ||||
| * | | Ansible module to manage secrets for openshift api | Kenny Woodson | 2016-03-14 | 1 | -0/+379 |
| | | | |||||
* | | | Merge pull request #883 from lebauce/openstack-integration | Brenton Leanhardt | 2016-03-14 | 6 | -1/+68 |
|\ \ \ | | | | | | | | | Add support for Openstack integration | ||||
| * | | | Add support for Openstack integration | Sylvain Baubeau | 2016-03-14 | 6 | -1/+68 |
| | | | | |||||
* | | | | Merge pull request #1550 from detiber/docker_refactor | Brenton Leanhardt | 2016-03-14 | 23 | -137/+242 |
|\ \ \ \ | | | | | | | | | | | Docker role refactor | ||||
| * | | | | improve ordering of systemd units | Jason DeTiberus | 2016-03-14 | 11 | -23/+34 |
| | | | | | |||||
| * | | | | Docker role refactor | Jason DeTiberus | 2016-03-14 | 12 | -114/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactors the docker role to push generic config into docker role and wrap openshift specific variables into an openshift_docker role and it's dependent openshift_docker_facts role - adds support for setting --confirm-def-push flag (Resolves https://github.com/openshift/openshift-ansible/issues/1014) - moves docker related facts from common/node roles to a new docker role - renames cli_docker_* role varialbes to openshift_docker-* (maintaining backward compatibility) - update role dependencies to pull in openshift_docker conditionally based on is_containerized - remove playbooks/common/openshift-docker since the docker role is now conditionally included | ||||
* | | | | | Merge pull request #1451 from sdodson/is-sync | Brenton Leanhardt | 2016-03-14 | 41 | -683/+1764 |
|\ \ \ \ \ | |/ / / / |/| | | | | Sync with latest image stream and templates | ||||
| * | | | | Sync latest to v1.2 | Scott Dodson | 2016-03-14 | 18 | -363/+484 |
| | | | | | |||||
| * | | | | Sync with latest image stream and templates | Scott Dodson | 2016-03-14 | 22 | -319/+1279 |
| | | | | | |||||
| * | | | | Allow origin version to be passed in as an argument | Scott Dodson | 2016-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | so we can continue syncing v1.1 content | ||||
* | | | | | Merge pull request #1596 from abutcher/containerized-bools | Brenton Leanhardt | 2016-03-14 | 7 | -11/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | Ensure is_containerized is cast as bool in templates and facts. | ||||
| * | | | | Ensure is_containerized is cast as bool. | Andrew Butcher | 2016-03-14 | 7 | -8/+8 |
| | | | | | |||||
| * | | | | openshift_facts: Safe cast additional bools | Samuel Munilla | 2016-03-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | openshift-ansible: Wrap boolean facts | Samuel Munilla | 2016-03-10 | 1 | -2/+11 |
| | |/ / | |/| | | | | | | | | | | | | | | Centralize the very weird process for converting strings to booleans to help keep the code consistent. | ||||
* | | | | Merge pull request #1578 from detiber/libvirt_fixes | Brenton Leanhardt | 2016-03-14 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Libvirt provider fixes | ||||
| * | | | | Libvirt provider fixes | Jason DeTiberus | 2016-03-10 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | - Use difference filter instead of reject/equalto - add ability to override vcpu and memory config for vms - add a dedicated drive for docker storage | ||||
* | | | | Expose log level on the monitor | Aniket Bhat | 2016-03-11 | 2 | -0/+5 |
| | | | | |||||
* | | | | Support log level configuration for plugin | Aniket Bhat | 2016-03-09 | 2 | -0/+4 |
|/ / / | |||||
* | | | Merge branch 'wait-all-the-time' of ↵ | Brenton Leanhardt | 2016-03-08 | 3 | -6/+6 |
|\ \ \ | | | | | | | | | | | | | https://github.com/abutcher/openshift-ansible | ||||
| * | | | Use /healthz/ready when verifying api | Andrew Butcher | 2016-03-08 | 3 | -6/+6 |
| | | | | |||||
* | | | | reverting back to pre-pulling the master image | Brenton Leanhardt | 2016-03-08 | 3 | -2/+12 |
|/ / / | |||||
* | | | Merge pull request #1559 from brenton/bz1315151 | Brenton Leanhardt | 2016-03-07 | 11 | -9/+12 |
|\ \ \ | | | | | | | | | BZ1315151: Support openshift_image_tag | ||||
| * | | | Don't enable cockpit-ws for containerized installs | Brenton Leanhardt | 2016-03-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | Support openshift_image_tag | Brenton Leanhardt | 2016-03-07 | 10 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the containerized openshift_pkg_version equivalent. Originally I was hoping to reuse openshift_pkg_version for containerized installs but the fact that it's very coupled to yum made that pretty ugly. However, I did opt to rely on the previously existing 'openshift_version' variable. Containerized and RPM installs can both use that variable and it will be set appropriately if either openshift_pkg_version or openshift_image_tag are set. I suspect someday containerized installs will be the only option and I didn't can to have thinkgs like openshift_pkg_version and openshift_image_tag in the playbooks anymore the necessary. |