summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* openshift_prometheus: remove block duration settingsPaul Gier2018-01-172-2/+2
| | | | | The prometheus block duration settings should not be changed from their defaults. See also: https://github.com/prometheus/prometheus/pull/3618
* 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
| * | | | | | | | Adding .ini to inventory_ignore_extensionsØystein Bedin2017-12-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #6536 from shawn-hurley/adding-asb-permissionsScott Dodson2018-01-161-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding ability for ASB to interact with network resources.
| * | | | | | | | | adding ability to add network policy objects.Shawn Hurley2018-01-051-0/+3
| | | | | | | | | |
| * | | | | | | | | adding ability to interact with network resources.Shawn Hurley2017-12-201-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6741 from sdodson/bz1534905Scott Dodson2018-01-161-1/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Remove tuned-profiles from list of master packages upgraded
| * | | | | | | | | Remove tuned-profiles from list of master packages upgradedScott Dodson2018-01-161-1/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.20.0].Jenkins CD Merge Bot2018-01-152-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #6610 from mazzystr/update_awsec2_root_volOpenShift Merge Robot2018-01-151-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update to AWS EC2 root vol size so that Health Check tasks pass AWS EC2s under the ASG and LaunchConfig are deployed with the default 10gb root vol size. Heath Checks fail because / filesystem and /var directory is too small. Health Check wants a minimum of 40Gb. 10Gb is just too small for server operations in general. Let's increase to 100Gb. Cost increase for additional EBS storage will be minimal and give plenty of elbow room for normal server operations.
| * | | | | | | | | Update to AWS EC2 root vol size so that Health Check tasks passChris Callegari2018-01-081-0/+8
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6692 from abutcher/cluster-operatorOpenShift Merge Robot2018-01-157-19/+64
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Separate ELB & S3 from master node group provisioning Moved s3 and elb provisioning out of `roles/openshift_aws/tasks/provisioning.yml` and into their own playbooks. These playbooks are now included in the provision playbook and in a WIP infrastructure playbook we intend to run up front in place of prerequisites. @kwoodson what are your thoughts on something like this?
| * | | | | | | | | | Add cluster-operator playbook directory.Andrew Butcher2018-01-102-0/+22
| | | | | | | | | | |
| * | | | | | | | | | Move s3 & elb provisioning into their own playbooks s.t. they are applied ↵Andrew Butcher2018-01-105-19/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside of the openshift_aws master provisioning tasks.
* | | | | | | | | | | Merge pull request #6726 from bogdando/fix_openstack_docsOpenShift Merge Robot2018-01-152-5/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix openstack provider docs Fix openstack provider playbook name in docs Adjust required versions of dependencies. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
| * | | | | | | | | | | Adjust openstack provider dependencies versionsBogdan Dobrelya2018-01-151-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
| * | | | | | | | | | | Fix openstack provider playbook name in docsBogdan Dobrelya2018-01-151-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* | | | | | | | | | | Merge pull request #6103 from dulek/dulek/cni-daemonOpenShift Merge Robot2018-01-153-23/+355
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Configure Kuryr CNI daemon Kuryr CNI daemon is scalability improvement that moves watching K8s API and VIF plugging into a separate entity called kuryr-daemon. Kuryr-daemon will run in a container and serve requests from kuryr-driver.
| * | | | | | | | | | Configure Kuryr CNI daemonMichał Dulko2017-12-223-23/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kuryr CNI daemon is scalability improvement that moves watching K8s API and VIF plugging into a separate entity called kuryr-daemon. Kuryr-daemon will run in a container and serve requests from kuryr-driver.
* | | | | | | | | | | Merge pull request #6707 from spadgett/console-upgradeScott Dodson2018-01-131-3/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Install web console on upgrade
| * | | | | | | | | | | Install web console on upgradeSamuel Padgett2018-01-111-3/+9
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #6426 from danwinship/cleanup-ipamScott Dodson2018-01-131-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clean up host-local IPAM data while nodes are drained
| * | | | | | | | | | | Clean up host-local IPAM data while nodes are drainedDan Winship2017-12-141-0/+6
| | | | | | | | | | | |