summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use openshift_is_containerized instead of openshift_is_atomic when ↵Vadim Rutkovsky2018-01-181-1/+1
| | | | | | installing etcd This allows non-Atomic hosts to be used to install containerized etcd
* Merge pull request #6589 from vrutkovs/kibana-use-sixOpenShift Merge Robot2018-01-182-14/+11
|\ | | | | | | | | Automatic merge from submit-queue. kibana checks: use six.moves instead of ImportError
| * kibana checks: use six.moves instead of ImportErrorVadim Rutkovsky2018-01-032-14/+11
| |
* | Merge pull request #6752 from vrutkovs/tsb-prefixOpenShift Merge Robot2018-01-182-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Rework default TSB prefix and imagename to match other services Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1518917
| * | Rework default TSB prefix and imagename to match other servicesVadim Rutkovsky2018-01-172-4/+4
| | |
* | | Merge pull request #6743 from ewolinetz/logging_find_running_podsOpenShift Merge Robot2018-01-172-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure we are running oc execs against running pods We should make sure we are running `oc exec` statements against running pods only. Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1534879
| * | | Ensure we are running oc execs against running podsEric Wolinetz2018-01-162-4/+4
| | | |
* | | | Merge pull request #6747 from ewolinetz/logging_fix_pvc_storageclassOpenShift Merge Robot2018-01-171-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Setting default storage_class_names for when calling openshift_loggin… …g_elasticsearch role Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1521218
| * | | | Setting default storage_class_names for when calling ↵Eric Wolinetz2018-01-161-4/+4
| |/ / / | | | | | | | | | | | | openshift_logging_elasticsearch role
* | | | Merge pull request #6076 from abutcher/bz1511357Scott Dodson2018-01-172-2/+3
|\ \ \ \ | | | | | | | | | | Bug 1511357: Task "Reload generated facts" failed while scaling up containerized masters
| * | | | Pull openshift_image_tag from oo_masters_to_config rather oo_first_master.Andrew Butcher2018-01-171-1/+1
| | | | |
| * | | | Default install_result when reloading generated facts.Andrew Butcher2018-01-171-1/+2
| | | | |
* | | | | Merge pull request #6181 from mrsiano/grafanaScott Dodson2018-01-1713-0/+6059
|\ \ \ \ \ | | | | | | | | | | | | Add new grafana playbook.
| * | | | | Add new grafana playbook.Eldad Marciano2018-01-1713-0/+6059
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this patch introduce a new playbook and roles to deploy grafana automaticly using openshift-ansible capabilities. this patch will abstract the grafana deployment process specially for openshift.
* | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.21.0].Jenkins CD Merge Bot2018-01-172-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #6744 from sosiouxme/20180115-fix-checksMichael Gugino2018-01-172-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | openshift_checks: repair adhoc list-checks mode
| * | | | | | openshift_checks: repair adhoc list-checks modeLuke Meyer2018-01-162-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1509157 docker_image_availability.__init__ was loading a variable that of course was not defined for localhost, which is how this play runs. Fixed that. Would be nice if there were a more generic way to solve that class of problem but I can't think of anything for now that isn't worse. Also noticed that this play gathers facts for localhost. That's not necessary for what it's doing, so disabled that.
* | | | | | | Merge pull request #6751 from vrutkovs/apply-check-rcOpenShift Merge Robot2018-01-176-9/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Check that rc != 0 for steps with 'failed_when' Some parts don't check the result rc at all, some check that 'error' is present there. Instead the safest way is to check for both Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534538
| * | | | | | | Fix a typo in "Determine if growpart is installed"Vadim Rutkovsky2018-01-171-1/+1
| | | | | | | |
| * | | | | | | Check rc for commands with openshift_client_binary and failed_whenVadim Rutkovsky2018-01-175-8/+18
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | This might mask some failures and continue instead of a failure
* | | | | | | Merge pull request #6759 from mgugino-upstream-stage/etcd-upgrade-factsScott Dodson2018-01-171-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add init/main.yml to etc-upgrade
| * | | | | | | Add init/main.yml to etc-upgradeMichael Gugino2018-01-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, etcd upgrade playbook only calls evaluate_groups to limit the number of tasks that are run against nodes during initialization. Recently, changes have been added to allow skipping of most node tasks via providing variablized host groups during initialization code. This commit allows etcd upgrades to use common init code to ensure necessary facts are defined and proper variables are sanity checked. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1527771
* | | | | | | | Merge pull request #6746 from ↵OpenShift Merge Robot2018-01-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | juanvallejo/jvallejo/fix-elasticsearch-diskspace-check Automatic merge from submit-queue. include elasticsearch container name Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534988 Addresses cases where the elasticsearch pod with multiple containers does not have the `elasticsearch` container as its first one. cc @sosiouxme
| * | | | | | | include elasticsearch container namejuanvallejo2018-01-161-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6520 from sdodson/37-38-39Scott Dodson2018-01-1715-42/+89
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Faciliate 3.7 to 3.8 to 3.9 upgrade
| * | | | | | | Add call to 3.8 playbook in 3.9 upgradeScott Dodson2018-01-179-12/+66
| | | | | | | |
| * | | | | | | Remove 3.8 and 3.9 specific steps right nowScott Dodson2018-01-175-27/+0
| | | | | | | |
| * | | | | | | Exclude 3.9 packages during 3.8 upgradeScott Dodson2018-01-175-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some obsoletes in 3.9 packages which lead yum to upgrade directly from 3.7 to 3.9 when you ask for 3.8 packages while 3.9 repos are enabled. Since we'd like to allow people to run one playbook to upgrade from 3.7 to 3.8 to 3.9 we need to exclude those packages when upgrading to 3.8
| * | | | | | | fix typosScott Dodson2018-01-172-2/+2
| | | | | | | |
| * | | | | | | Ensure openshift_client_binary is setScott Dodson2018-01-171-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #6588 from vrutkovs/remove-ansible-compat-sixScott Dodson2018-01-173-17/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't use from ansible.module_utils.six as its no longer available in Ansible 2.4
| * | | | | | | | Don't use from ansible.module_utils.six as its no longer available in ↵Vadim Rutkovsky2018-01-123-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ansible 2.4
* | | | | | | | | Merge pull request #6696 from sdodson/bz1532973Scott Dodson2018-01-171-0/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing task that got dropped in a refactor
| * | | | | | | | | Add missing task that got dropped in a refactorScott Dodson2018-01-161-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed in 28b254886bf17251e973bfdad4dd4c89e26187fc
* | | | | | | | | | Merge pull request #6714 from tomassedovic/move-openstack-inventoryOpenShift Merge Robot2018-01-172-1/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Move OpenStack inventory.py out of sample-inventory This moves the dynamic inventory for OpenStack from the `sample-inventory` dir users are expected to copy and edit to `/inventory/openstack`. This will ensure that people don't use an outdated inventory as well as communicates that the inventory (similar to the playbooks and roles) is not something they are expected to modify under normal circumstances. The sample inventory will now contain only `group_vars` and as such, moving from that to providing vars explicitly is also more obvious (you replace the `-i inventory` command with `-e @vars.yaml` and you're good to go).
| * | | | | | | | | Document the inventory changeTomas Sedovic2018-01-161-1/+9
| | | | | | | | | |
| * | | | | | | | | Move the OpenStack dynamic inventory from sampleTomas Sedovic2018-01-161-0/+0
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping the dynamic inventory in the `sample-inventory` alongside the `group_vars` poses a problem: when we update the inventory, our users won't get the latest version. The dynamic inventory should be independent of the OpenShift or OpenStack configuration and the users should be able to either pass it explicitly or create a symlink if they want.
* | | | | | | | | Merge pull request #6730 from spadgett/console-config-api-changesScott Dodson2018-01-165-23/+84
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update console config for API changes
| * | | | | | | | | Update console config for API changesSamuel Padgett2018-01-165-23/+84
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6531 from abutcher/bootstrap-slurp-userOpenShift Merge Robot2018-01-161-15/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Use master group ansible_ssh_user to pull bootstrap kubeconfig
| * | | | | | | | | Setup master groups in order to use the master group's ansible_ssh_user to ↵Andrew Butcher2018-01-091-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull bootstrap kubeconfig.
* | | | | | | | | | Merge pull request #6498 from joelddiaz/origin-ansible-boto3Scott Dodson2018-01-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | add python2-boto3 for centos-based origin-ansible container image
| * | | | | | | | | add python2-boto3 package for centos-based origin-ansible container imageJoel Diaz2018-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are modules in openshift-ansible that depend on boto3 (I see lib_utils/library/oo_iam_kms and lib_utils/library/oo_ec2_group). Add the dependency so that the origin-ansible container can succesfully run these modules.
* | | | | | | | | | Merge pull request #6739 from vrutkovs/metrics-console-mktempScott Dodson2018-01-161-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Web Console: use a different var for asset config
| * | | | | | | | | Web Console: use a different var for asset configVadim Rutkovsky2018-01-161-5/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures mktemp from metrics role doesn't get reset when update_asset_config is being included
* | | | | | | | | Merge pull request #6719 from wmengRH/fix_bug_1534271Scott Dodson2018-01-161-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix bug 1534271
| * | | | | | | | | fix bug 1534271MENG Weihua2018-01-151-4/+4
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6706 from spadgett/console-rbacOpenShift Merge Robot2018-01-163-4/+48
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add console RBAC template Required for https://github.com/openshift/origin-web-console-server/pull/18 Origin changes: https://github.com/openshift/origin/pull/18075 /assign @sdodson /cc @deads2k
| * | | | | | | | Add console RBAC templateSamuel Padgett2018-01-113-4/+48
| | | | | | | | |
* | | | | | | | | Merge pull request #6470 from oybed/cfgScott Dodson2018-01-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding .ini to inventory_ignore_extensions