summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1620 from BlueShells/BuildappMonitorKenny Woodson2016-03-162-51/+51
|\ | | | | change type to value_type
| * change type to value_typezhizhang2016-03-162-51/+51
| |
* | Merge pull request #1617 from BlueShells/BuildappMonitorKenny Woodson2016-03-161-2/+2
|\| | | | | change time from int to float
| * change time from int to floatzhizhang2016-03-161-2/+2
| |
* | Merge pull request #1606 from BlueShells/BuildappMonitorKenny Woodson2016-03-161-0/+33
|\| | | | | Buildapp monitor
| * change the check time from 1 hour to 2 hourzhizhang2016-03-161-2/+2
| |
| * add item of time cost a app build and app createzhizhang2016-02-291-0/+12
| |
| * add trigger for app creation with build processzhizhang2016-02-251-0/+15
| |
| * add key of openshift.master.app.build.createzhizhang2016-02-241-0/+6
| |
* | Automatic commit of package [openshift-ansible] release [3.0.59-1].Brenton Leanhardt2016-03-162-2/+7
| |
* | Merge pull request #1613 from sdodson/bz1317734Brenton Leanhardt2016-03-161-1/+5
|\ \ | | | | | | Only mask etcd service for containerized installls when it's installed
| * | Only mask etcd service for containerized installls when it's installedScott Dodson2016-03-151-1/+5
| | |
* | | Merge pull request #1609 from abutcher/check-w-certsBrenton Leanhardt2016-03-165-5/+10
|\ \ \ | | | | | | | | Provide cacert when performing health checks
| * | | Provide cacert when performing health checksAndrew Butcher2016-03-155-5/+10
| |/ /
* | | Automatic commit of package [openshift-ansible] release [3.0.58-1].Kenny Woodson2016-03-152-2/+10
| | |
* | | Merge pull request #1608 from kwoodson/group_selectorKenny Woodson2016-03-151-22/+53
|\ \ \ | |/ / |/| | Adding group selectors to multi_inventory.
| * | Group selector feature addedKenny Woodson2016-03-151-22/+53
|/ /
* | Merge pull request #1604 from enoodle/nfs_yum_to_pkg_managerBrenton Leanhardt2016-03-151-3/+1
|\ \ | | | | | | nfs: replace yum with dnf
| * | nfs: replace yum with dnfErez Freiberger2016-03-151-3/+1
| | |
* | | Merge pull request #1603 from detiber/move_common_common_factsBrenton Leanhardt2016-03-1512-155/+118
|\ \ \ | |/ / |/| | Move common common facts to openshift_facts
| * | Move common common facts to openshift_factsJason DeTiberus2016-03-1512-155/+118
| | | | | | | | | | | | | | | | | | | | | - 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/docker182Brenton Leanhardt2016-03-151-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.9Scott Dodson2016-03-141-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.
* | | Merge pull request #1602 from detiber/oc_client_tweakBrenton Leanhardt2016-03-151-9/+6
|\ \ \ | |/ / |/| | perform oc client config tasks only once when ansible_ssh_user is root
| * | perform oc client config tasks only once when ansible_ssh_user is rootJason DeTiberus2016-03-151-9/+6
|/ /
* | Automatic commit of package [openshift-ansible] release [3.0.57-1].Brenton Leanhardt2016-03-142-2/+14
| |
* | Merge pull request #1599 from brenton/bz1315564Brenton Leanhardt2016-03-142-3/+38
|\ \ | | | | | | Bug 1315564 - Containerized installs require a running environment
| * | Docker stderr can break this script if ansible executes it remotelyBrenton Leanhardt2016-03-141-2/+2
| | |
| * | Handle HA master caseBrenton Leanhardt2016-03-141-2/+17
| | |
| * | Bug 1315564 - Containerized installs require a running environmentBrenton Leanhardt2016-03-141-0/+20
|/ / | | | | | | | | If the master or node aren't running we can't determine the correct version that is currently installed.
* | Merge pull request #1597 from brenton/masterBrenton Leanhardt2016-03-142-4/+3
|\ \ | | | | | | Bug 1316761 - Skip the available version check if openshift_image_tag…
| * | Updating the docker registry variables to use the new nameBrenton Leanhardt2016-03-141-2/+2
| | |
| * | Bug 1316761 - Skip the available version check if openshift_image_tag is ↵Brenton Leanhardt2016-03-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | defined. We already have a check in pre.yml to make sure openshift_image_tag is set to a range that is allowed. This is an advanced setting and should be used to override whatever is returned by the 'latest' image in a given registry.
* | | Merge pull request #1594 from kwoodson/lib_openshift_apiKenny Woodson2016-03-141-0/+379
|\ \ \ | | | | | | | | First attempt at openshift api secrets module
| * | | Ansible module to manage secrets for openshift apiKenny Woodson2016-03-141-0/+379
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.56-1].Kenny Woodson2016-03-142-2/+18
| | | |
* | | | Merge pull request #1598 from kwoodson/metafixKenny Woodson2016-03-145-147/+46
|\ \ \ \ | |_|/ / |/| | | Updates for metadata tooling to work without env.
| * | | Updating our metadata tooling to work without envKenny Woodson2016-03-145-147/+46
| | | |
* | | | Merge pull request #883 from lebauce/openstack-integrationBrenton Leanhardt2016-03-146-1/+68
|\ \ \ \ | | | | | | | | | | Add support for Openstack integration
| * | | | Add support for Openstack integrationSylvain Baubeau2016-03-146-1/+68
| | | | |
* | | | | Merge pull request #1550 from detiber/docker_refactorBrenton Leanhardt2016-03-1436-176/+309
|\ \ \ \ \ | |_|/ / / |/| | | | Docker role refactor
| * | | | improve ordering of systemd unitsJason DeTiberus2016-03-1411-23/+34
| | | | |
| * | | | Docker role refactorJason DeTiberus2016-03-1425-153/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-syncBrenton Leanhardt2016-03-1441-683/+1764
|\ \ \ \ \ | |/ / / / |/| | | | Sync with latest image stream and templates
| * | | | Sync latest to v1.2Scott Dodson2016-03-1418-363/+484
| | | | |
| * | | | Sync with latest image stream and templatesScott Dodson2016-03-1422-319/+1279
| | | | |
| * | | | Allow origin version to be passed in as an argumentScott Dodson2016-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | so we can continue syncing v1.1 content
* | | | | Merge pull request #1596 from abutcher/containerized-boolsBrenton Leanhardt2016-03-147-11/+20
|\ \ \ \ \ | |/ / / / |/| | | | Ensure is_containerized is cast as bool in templates and facts.
| * | | | Ensure is_containerized is cast as bool.Andrew Butcher2016-03-147-8/+8
| | | | |
| * | | | openshift_facts: Safe cast additional boolsSamuel Munilla2016-03-101-1/+1
| | | | |