summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5813 from ashcrow/1503903OpenShift Merge Robot2017-10-239-62/+101
|\ | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Always ensure atomic.conf is configured for system containers. A new openshift_atomic role has been created for atomic specific tasks. The first task added is proxy which handles updating /etc/atomic.conf to ensure the proper proxy configuration is configured. This task file is then included (via include_role) in system container related task files. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903
| * systemcontainers: Verify atomic.conf proxy is always configuredSteve Milner2017-10-199-62/+101
| | | | | | | | | | | | | | | | | | | | | | A new openshift_atomic role has been created for atomic specific tasks. The first task added is proxy which handles updating /etc/atomic.conf to ensure the proper proxy configuration is configured. This task file is then included (via include_role) in system container related task files. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903 Signed-off-by: Steve Milner <smilner@redhat.com>
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.175.0].Jenkins CD Merge Bot2017-10-232-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.174.0].Jenkins CD Merge Bot2017-10-222-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.173.0].Jenkins CD Merge Bot2017-10-222-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.172.0].Jenkins CD Merge Bot2017-10-222-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.171.0].Jenkins CD Merge Bot2017-10-212-2/+11
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5748 from portante/fix-cpu-limitsScott Dodson2017-10-2023-68/+154
|\ \ | | | | | | Use "requests" for CPU resources instead of limits
| * | Use "requests" for CPU resources instead of limitsPeter Portante2017-10-1923-68/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use a CPU request to ensure logging infrastructure pods are not capped by default for CPU usage. It is still important to ensure we have a minimum amount of CPU. We keep the use of the variables *_cpu_limit so that the existing behavior is maintained. Note that we don't want to cap an infra pod's CPU usage by default, since we want to be able to use the necessary resources to complete it's tasks. Bug 1501960 (https://bugzilla.redhat.com/show_bug.cgi?id=1501960)
* | | Merge pull request #5792 from mgugino-upstream-stage/fix-master-undefined-varScott Dodson2017-10-201-0/+4
|\ \ \ | | | | | | | | Fix undefined variable for master upgrades
| * | | Fix undefined variable for master upgradesMichael Gugino2017-10-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, oreg_auth_credentials_replace is undefined during master upgrades. This commit ensures this variable is defined during upgrades.
* | | | Merge pull request #5752 from kwoodson/bz1491399Scott Dodson2017-10-201-0/+13
|\ \ \ \ | | | | | | | | | | [bz1491399] Adding pre check to verify clusterid is set along with cloudprovider when performing upgrade.
| * | | | Adding pre check to verify clusterid is set along with cloudprovider when ↵Kenny Woodson2017-10-161-0/+13
| | | | | | | | | | | | | | | | | | | | performing upgrade.
* | | | | Merge pull request #5794 from kwoodson/bz1501271Scott Dodson2017-10-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [bz1501271] Attempt to use ami ssh user and default to ansible_ssh_user.
| * | | | | [bz1501271] Attempt to use ami ssh user and default to ansible_ssh_user.Kenny Woodson2017-10-181-1/+1
| | |/ / / | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.170.0].Jenkins CD Merge Bot2017-10-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5821 from abutcher/ca-trust-skip-restartScott Dodson2017-10-201-2/+14
|\ \ \ \ \ | | | | | | | | | | | | Check for container runtime prior to restarting when updating system CA trust.
| * | | | | Check for container runtime prior to restarting when updating system CA trust.Andrew Butcher2017-10-191-2/+14
| | | | | |
* | | | | | Merge pull request #5766 from jcantrill/1489498_preserve_replica_countScott Dodson2017-10-206-6/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | bug 1489498. preserve replica and shard settings
| * | | | | | bug 1489498. preserve replica and shard settingsJeff Cantrill2017-10-176-6/+63
| | | | | | |
* | | | | | | Merge pull request #5749 from abutcher/servinginfo-client-ca-upgradeOpenShift Merge Robot2017-10-202-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Set servingInfo.clientCA to ca.crt during upgrade. https://bugzilla.redhat.com/show_bug.cgi?id=1501795
| * | | | | | | Set servingInfo.clientCA to ca.crt during upgrade.Andrew Butcher2017-10-172-0/+10
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.169.0].Jenkins CD Merge Bot2017-10-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #5783 from dymurray/readinessScott Dodson2017-10-201-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug 1503233 - Add liveness and readiness probe checks to ASB deployme…
| * | | | | | | | Indentation errorsDylan Murray2017-10-171-14/+14
| | | | | | | | |
| * | | | | | | | Bug 1503233 - Add liveness and readiness probe checks to ASB deploymentconfigDylan Murray2017-10-171-0/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #5574 from dulek/containerized_kuryr_supportScott Dodson2017-10-2015-3/+723
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Initial Kuryr support
| * | | | | | | | | Initial Kuryr supportMichał Dulko2017-10-2015-3/+723
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit enables deploying Kuryr networking on top of OpenShift in containers. kuryr-controller is a Deployment and kuryr-cni is deployed as DaemonSet (container will drop all CNI configuration files). Co-Authored-By: Antoni Segura Puimedon <celebdor@gmail.com>
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.168.0].Jenkins CD Merge Bot2017-10-202-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.167.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.166.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.165.0].Jenkins CD Merge Bot2017-10-192-2/+5
| |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.164.0].Jenkins CD Merge Bot2017-10-192-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5746 from staebler/Bug_1496694_new_resource_namesScott Dodson2017-10-1910-73/+125
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Update service catalog playbook for service-catalog rc1
| * | | | | | | | Change to service-signer.crt for template_service_broker CA_BUNDLEstaebler2017-10-182-3/+3
| | | | | | | | |
| * | | | | | | | Use service-signer.crt for ca_bundle passed to clusterservicebrokerstaebler2017-10-182-2/+6
| | | | | | | | |
| * | | | | | | | Rename ServiceBroker to ClusterServiceBroker for ansible_service_broker task.staebler2017-10-172-3/+3
| | | | | | | | |
| * | | | | | | | Add apiserver.crt to service-catalog controller-manager deployment.staebler2017-10-172-0/+21
| | | | | | | | |
| * | | | | | | | Remove redundant faulty role binding ifrom kubeservicecatalog_roles_bindings.ymlstaebler2017-10-174-16/+3
| | | | | | | | |
| * | | | | | | | Update service catalog playbook for service-catalog rc1staebler2017-10-147-64/+104
| | | | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.163.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5809 from enoodle/set_use_manageiq_as_defaultScott Dodson2017-10-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | set use_manageiq true as default
| * | | | | | | | | set use_manageiq as defaultErez Freiberger2017-10-191-1/+1
|/ / / / / / / / /
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.162.0].Jenkins CD Merge Bot2017-10-192-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5763 from mgugino-upstream-stage/fix-master-config-upgradeScott Dodson2017-10-184-64/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unneeded master config updates during upgrades
| * | | | | | | | | Remove unneeded master config updates during upgradesMichael Gugino2017-10-174-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, upgrade_control_plane.yml will add any missing sections to the openshift master's config. These additions are only needed once. Users who perform multiple upgrades to their clusters over time do not need to have these variables re-inserted. Currently, re-inserting these variables can cause unwanted local changes. This commit ensures that the variables are only inserted into openshift master's config once. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1486054
* | | | | | | | | | Merge pull request #5804 from smarterclayton/increase_timeoutScott Dodson2017-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Wait longer for GCP stability
| * | | | | | | | | | Wait longer for stable GCP instancesClayton Coleman2017-10-181-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are seeing instances take longer than 5m to become available, possibly due to GCP infra issues.
* | | | | | | / / / Automatic commit of package [openshift-ansible] release [3.7.0-0.161.0].Jenkins CD Merge Bot2017-10-182-2/+5
| |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.160.0].Jenkins CD Merge Bot2017-10-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug