summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into Upgrade_Calico_Version_to_2.2.1Scott Dodson2017-06-1347-934/+695
|\
| * Merge pull request #4404 from abutcher/etcd-ca-redeployScott Dodson2017-06-134-136/+170
| |\ | | | | | | Separate etcd and OpenShift CA redeploy playbooks.
| | * Separate etcd and OpenShift CA redeploy playbooks.Andrew Butcher2017-06-094-136/+170
| | |
| * | Merge pull request #4295 from VincentS/Remove_Hardcoded_Calico_URLOpenShift Bot2017-06-132-1/+2
| |\ \ | | | | | | | | Merged by openshift-bot
| | * | Removed hardocded Calico Policy Controller URLVincent Schwarzer2017-05-302-1/+2
| | | |
| * | | Merge pull request #4302 from ewolinetz/pv_node_selectorsOpenShift Bot2017-06-138-4/+43
| |\ \ \ | | | | | | | | | | Merged by openshift-bot
| | * | | Making pylint happyewolinetz2017-06-121-1/+1
| | | | |
| | * | | Allowing openshift_metrics to specify PV selectors and allow way to define ↵ewolinetz2017-05-268-3/+42
| | | | | | | | | | | | | | | | | | | | selectors when creating pv
| * | | | Merge pull request #4381 from jarrpa/non-zero-parseOpenShift Bot2017-06-1328-784/+448
| |\ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| | * | | | lib/base: allow for results parsing on non-zero return codeJose A. Rivera2017-06-0828-784/+448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On an 'oc get' in particular, the command may return a non-zero error code while still having found valid resources. Thus, we should parse the valid output while still reporting the error. oc_obj.get(), for instance, takes care of determining if the return code should be reset to 0 in some error cases. Also do a bit of logic cleanup and output sanitizing. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | Merge pull request #4433 from ashcrow/ansible-retriesScott Dodson2017-06-133-4/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | System Container and Ansible Retries
| | * | | | | Update mounts in system container installerSteve Milner2017-06-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will allow retry files to be stored in $HOME_ROOT. - SSH_ROOT replaced with HOME_ROOT - /root[container] -> $HOME_ROOT[host]
| | * | | | | Set ansible retry file locationSteve Milner2017-06-131-0/+1
| | | | | | |
| * | | | | | Merge pull request #4380 from jarrpa/oc_obj-fixesOpenShift Bot2017-06-132-4/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| | * | | | | | oc_obj: set _delete() rc to 0 if err is 'not found'Jose A. Rivera2017-06-062-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting multiple objects, allow for some resources to already be absent. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| | * | | | | | oc_obj: only check 'items' if exists in deleteJose A. Rivera2017-06-062-2/+4
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | Merge pull request #4432 from giuseppe/installer-dnsScott Dodson2017-06-131-0/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | installer: add bind mount for /etc/resolv.conf
| | * | | | | installer: add bind mount for /etc/resolv.confGiuseppe Scrivano2017-06-131-0/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the DNS configuration from the host. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1460978 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | Merge pull request #4410 from rhcarvalho/fix-4306-gluster-varsScott Dodson2017-06-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix possible access to undefined variable
| | * | | | | Fix possible access to undefined variableRodolfo Carvalho2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | g_glusterfs_hosts is verified to be defined in the beginning of the playbook. g_glusterfs_registry_hosts is only defined when playbooks/byo/openshift-cluster/cluster_hosts.yml is loaded, which seems to not always be the case. Instead of trying to find all entrypoints where cluster_hosts should be loaded to defined the variable, simply use the `default()` filter to consider it empty when not defined.
* | | | | | | Upgraded Calico to 2.2.1 ReleaseVincent Schwarzer2017-06-132-5/+5
|/ / / / / /
* | | | | | Merge pull request #4388 from giuseppe/etcd-container-to-system-containerOpenShift Bot2017-06-134-11/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | certificates: copy the certificates for the etcd system containerGiuseppe Scrivano2017-06-102-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | etcd: system container defines ETCD_(PEER_)?TRUSTED_CA_FILEGiuseppe Scrivano2017-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | etcd: unmask system container service before installing itGiuseppe Scrivano2017-06-081-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | etcd: copy previous database when migrating to system containerGiuseppe Scrivano2017-06-081-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | etcd: define data dir location for the system containerGiuseppe Scrivano2017-06-082-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.100-1].Jenkins CD Merge Bot2017-06-132-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.106
* | | | | | | Merge pull request #4403 from abutcher/node-daemon-reloadOpenShift Bot2017-06-122-7/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Add daemon-reload handler to openshift_node and notify when /etc/systemd ↵Andrew Butcher2017-06-092-7/+21
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | files have been updated.
* | | | | | | Merge pull request #4223 from hemmop/bug/storage-class-annotationOpenShift Bot2017-06-122-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Use volume.beta.kubernetes.io annotation for storage-classesPer Carlson2017-06-082-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4407 from gnufied/fix-default-storage-class-keyScott Dodson2017-06-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change default key for gce
| * | | | | | | Change default key for gceHemant Kumar2017-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usual convention is to use gce not gcp
* | | | | | | | Merge pull request #4391 from mtnbikenc/1456096OpenShift Bot2017-06-124-0/+36
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Merged by openshift-bot
| * | | | | | | Correct master-config update during upgradeRussell Teague2017-06-084-0/+36
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4401 from ingvagabund/embedded-etcd-set-correct-etcd-pathJan Chaloupka2017-06-123-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | set etcd working directory for embedded etcd
| * | | | | | | set etcd working directory for embedded etcdJan Chaloupka2017-06-103-3/+5
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.99-1].Jenkins CD Merge Bot2017-06-122-2/+18
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.105
* | | | | | | Merge pull request #4400 from ingvagabund/replace-repoquery-with-moduleJan Chaloupka2017-06-101-9/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | replace repoquery with module
| * | | | | | | Replace repoquery with moduleJan Chaloupka2017-06-091-9/+11
| |/ / / / / /
* | | | | | | Merge pull request #4382 from jarrpa/oc_secret-forceOpenShift Bot2017-06-093-10/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | oc_secret: allow use of force for secret typeJose A. Rivera2017-06-073-10/+19
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | Merge pull request #4262 from gnufied/default-storage-classOpenShift Bot2017-06-096-0/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Add dependency and use same storageclass name as upstreamHemant Kumar2017-05-252-2/+4
| | | | | | | |
| * | | | | | | Add documentationHemant Kumar2017-05-231-0/+2
| | | | | | | |
| * | | | | | | Install default storageclass in AWS & GCE envsHemant Kumar2017-05-226-0/+86
| | | | | | | |
* | | | | | | | Merge pull request #3787 from juanvallejo/jvallejo/docker-storage-checkOpenShift Bot2017-06-095-29/+468
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Consider previous value of 'changed' when updatingRodolfo Carvalho2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids unintentionally overriding the value from `True` to `False`.
| * | | | | | | | Improve code readabilityRodolfo Carvalho2017-06-091-1/+3
| | | | | | | | |