summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #739 from codificat/vagrant-noregisterBrenton Leanhardt2015-11-132-23/+2
|\ | | | | Vagrantfile cleanup: remove unnecessary RHEL registration and network workaround
| * Vagrant RHEL registration cleanupPep TurrĂ³ Mauri2015-10-242-23/+2
| | | | | | | | Remove vagrant-registration because it's not needed anymore.
* | Merge pull request #867 from ibotty/rm-netaddr-depBrenton Leanhardt2015-11-132-4/+20
|\ \ | | | | | | remove netaddr dependency
| * | remove netaddr dependencyTobias Florek2015-11-112-4/+20
| | |
* | | Merge pull request #885 from dgoodwin/pylint-pythonpathBrenton Leanhardt2015-11-131-0/+2
|\ \ \ | | | | | | | | Fix pylint import errors for utils/test/.
| * | | Fix pylint import errors for utils/test/.Devan Goodwin2015-11-121-0/+2
| | | | | | | | | | | | | | | | pylint is unable to import the modules in src as they are not on the path.
* | | | Merge pull request #884 from smunilla/english_updatesBrenton Leanhardt2015-11-121-4/+8
|\ \ \ \ | | | | | | | | | | atomic-openshift-installer: Update prompts and help messages
| * | | | atomic-openshift-installer: Update prompts and help messagesSamuel Munilla2015-11-121-4/+8
| | | | |
* | | | | Merge pull request #886 from smunilla/sudo_checkBrenton Leanhardt2015-11-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | atomic-openshift-installer: Update nopwd sudo test
| * | | | atomic-openshift-installer: Update nopwd sudo testSamuel Munilla2015-11-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | This is an update to the no password sudo test meant to address some weirdness around group vs. user permissions.
* | | | Merge pull request #880 from brenton/addtestsBrenton Leanhardt2015-11-121-32/+183
|\ \ \ \ | |/ / / |/| | | Test additions for cli_installer:get_hosts_to_install_on
| * | | Test additions for cli_installer:get_hosts_to_install_onBrenton Leanhardt2015-11-121-32/+183
| | | |
* | | | Merge pull request #882 from kwoodson/itserviceKenny Woodson2015-11-121-1/+2
|\ \ \ \ | |/ / / |/| | | Fixed a bug. Upon creation also add dependencies to slas.
| * | | Dependencies need to be added when a create occurs on SLA object.Kenny Woodson2015-11-121-1/+2
| | | |
* | | | Merge pull request #875 from kwoodson/itserviceKenny Woodson2015-11-123-1/+317
|\| | | | | | | | | | | Adding support for zabbix slas.
| * | | adding itserviceKenny Woodson2015-11-123-1/+317
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.12-1].Brenton Leanhardt2015-11-112-2/+5
| | | |
* | | | Merge pull request #873 from sdodson/latest-streamsBrenton Leanhardt2015-11-112-76/+327
|\ \ \ \ | | | | | | | | | | Sync with the latest image streams
| * | | | Sync with the latest image streamsScott Dodson2015-11-112-76/+327
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.11-1].Brenton Leanhardt2015-11-112-2/+6
| | | | |
* | | | | Merge pull request #781 from sdodson/xpaas-1.1Brenton Leanhardt2015-11-1133-1918/+3585
|\ \ \ \ \ | | | | | | | | | | | | Update xpaas streams and templates for their v1.1.0 release
| * | | | | Migrate xpaas content from pre v1.1.0Scott Dodson2015-11-111-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | This removes existing templates from disk and from the openshift namespace.
| * | | | | Import latest xpaas templates and image streamsScott Dodson2015-11-1132-1918/+3535
| |/ / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.0.10-1].Brenton Leanhardt2015-11-112-2/+10
| | | | |
* | | | | Merge pull request #872 from detiber/nodeIPWorkaroundBrenton Leanhardt2015-11-111-211/+233
|\ \ \ \ \ | | | | | | | | | | | | 3.0 to 3.1 general cleanup and template update fix
| * | | | | Fix update error for templates that didn't previously existJason DeTiberus2015-11-111-1/+8
| | | | | |
| * | | | | General cleanup of v3_0_to_v3_1/upgrade.ymlJason DeTiberus2015-11-111-210/+225
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reorder to push all non-changing checks first - Remove multiple plays where possible - Make formatting more consistent - Add additional comments to break up the different stages of the upgrade. - Use group names more consistently - Add package version checking to nodes
* | | | | Merge pull request #874 from joelddiaz/s3-slaJoel Diaz2015-11-112-0/+34
|\ \ \ \ \ | |/ / / / |/| | | | Add zabbix pieces to hold AWS S3 bucket stats
| * | | | Add zabbix pieces to hold AWS S3 bucket statsJoel Diaz2015-11-112-0/+34
| | | | |
* | | | | Merge pull request #868 from ibotty/oo-filter-dont-failThomas Wiest2015-11-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | oo_filter: don't fail when attribute is not defined
| * | | | | oo_filter: don't fail when attribute is not definedTobias Florek2015-11-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #871 from detiber/fixVagrantDocsBrenton Leanhardt2015-11-111-0/+1
|\ \ \ \ \ | | | | | | | | | | | | add ansible dep to vagrant doc
| * | | | | add ansible dep to vagrant docJason DeTiberus2015-11-111-0/+1
|/ / / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.0.9-1].Brenton Leanhardt2015-11-112-2/+5
| | | | |
* | | | | Merge pull request #839 from detiber/refactorUpgradeBrenton Leanhardt2015-11-1130-85/+259
|\ \ \ \ \ | | | | | | | | | | | | Refactor upgrade
| * | | | | Refactor upgrade playbook(s)Jason DeTiberus2015-11-1030-85/+259
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split playbooks into two, one for 3.0 minor upgrades and one for 3.0 to 3.1 upgrades - Move upgrade playbooks to common/openshift/cluster/upgrades from adhoc - Added a byo wrapper playbooks to set the groups based on the byo conventions, other providers will need similar playbooks added eventually - installer wrapper updates for refactored upgrade playbooks - call new 3.0 to 3.1 upgrade playbook - various fixes for edge cases I hit with a really old config laying around. - fix output of host facts to show connect_to value.
* | | | | Merge pull request #866 from sdodson/openshift-ansible308Brenton Leanhardt2015-11-112-2/+161
|\ \ \ \ \ | |/ / / / |/| | | | Automatic commit of package [openshift-ansible] release [3.0.8-1].
| * | | | Automatic commit of package [openshift-ansible] release [3.0.8-1].Scott Dodson2015-11-102-2/+161
|/ / / /
* | | | Merge pull request #863 from abutcher/uninstall-clientsBrenton Leanhardt2015-11-101-1/+2
|\ \ \ \ | | | | | | | | | | Add origin-clients to uninstall playbook.
| * | | | Add origin-clients to uninstall playbook.Andrew Butcher2015-11-101-1/+2
|/ / / /
* | | | Merge pull request #860 from smunilla/disable_container_based_installBrenton Leanhardt2015-11-102-9/+11
|\ \ \ \ | | | | | | | | | | atomic-openshift-installer: Remove question for container install
| * | | | Update tests now that cli is not asking for rpm/container installSamuel Munilla2015-11-101-2/+2
| | | | |
| * | | | atomic-openshift-installer: Remove question for container installSamuel Munilla2015-11-101-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Removing the option for a container-based install from the quick installer with it is in tech preview.
* | | | | Merge pull request #857 from sosiouxme/20151110-infrastructure-templatesBrenton Leanhardt2015-11-107-0/+560
|\ \ \ \ \ | | | | | | | | | | | | examples: include logging and metrics infrastructure
| * | | | | examples: include logging and metrics infrastructureLuke Meyer2015-11-107-0/+560
| |/ / / /
* | | | | Merge pull request #859 from detiber/no_multi_ec2Thomas Wiest2015-11-103-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove references to multi_ec2.py
| * | | | | Remove references to multi_ec2.pyJason DeTiberus2015-11-103-1/+2
| |/ / / /
* | | | | Merge pull request #854 from dgoodwin/pkg-ansible-cfgBrenton Leanhardt2015-11-105-3/+27
|\ \ \ \ \ | |/ / / / |/| | | | Package the default ansible.cfg with atomic-openshift-utils.
| * | | | Add separate step to enable services during upgrade.Devan Goodwin2015-11-101-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of combining this with tasks to restart services, add a separate started+enabled play for masters and nodes at the end of the playbook.
| * | | | 1279746: Fix leftover disabled features line in config template.Devan Goodwin2015-11-101-1/+0
| | | | |