summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4735 from ewolinetz/service_catalog_permsScott Dodson2017-07-111-0/+6
|\ | | | | Adding create permissions for serviceclasses.servicecatalog.k8s.io to…
| * Adding create permissions for serviceclasses.servicecatalog.k8s.io to ↵ewolinetz2017-07-111-0/+6
|/ | | | service-catalog-controller role
* Merge pull request #4701 from kwoodson/master_metrics_urlScott Dodson2017-07-111-0/+9
|\ | | | | [Bz 1468113] Configure the rest of the masters with the correct URL.
| * Removing trailing newline.Kenny Woodson2017-07-101-1/+0
| |
| * [Bz 1468113] Configure the rest of the masters with the correct URL.Kenny Woodson2017-07-061-0/+10
| |
* | Merge pull request #4730 from ozdanborne/patch-gencertsScott Dodson2017-07-112-26/+18
|\ \ | | | | | | Fix calico when certs are auto-generated
| * | Fix calico when certs are auto-generatedDan Osborne2017-07-102-26/+18
| | |
* | | Automatic commit of package [openshift-ansible] release [3.6.141-1].Jenkins CD Merge Bot2017-07-112-2/+6
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.141
* | | Merge pull request #4723 from ewolinetz/fix_service_catalog_fetchScott Dodson2017-07-101-0/+2
|\ \ \ | | | | | | | | updating fetch tasks to be flat paths
| * | | updating fetch tasks to be flat pathsewolinetz2017-07-101-0/+2
| | | |
* | | | Merge pull request #4725 from mtnbikenc/fix-network-managerScott Dodson2017-07-101-0/+2
|\ \ \ \ | |/ / / |/| | | Add evaluate_groups.yml to network_manager playbook
| * | | Add evaluate_groups.yml to network_manager playbookRussell Teague2017-07-101-0/+2
|/ / / | | | | | | | | | | | | The network_manager.yml playbook uses oo_* groups names which are defined in the evaluate_groups.yml playbook.
* | | Automatic commit of package [openshift-ansible] release [3.6.140-1].Jenkins CD Merge Bot2017-07-102-2/+5
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.140
* | | Automatic commit of package [openshift-ansible] release [3.6.139-1].Jenkins CD Merge Bot2017-07-082-2/+5
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.139
* | | Merge pull request #4624 from ↵Jan Chaloupka2017-07-085-0/+5
|\ \ \ | | | | | | | | | | | | | | | | ingvagabund/increase-timeout-when-waiting-for-master-and-nodes increase implicit 300s default timeout to explicit 600s
| * | | increase implicit 300s default timeout to explicit 600sJan Chaloupka2017-06-285-0/+5
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.6.138-1].Jenkins CD Merge Bot2017-07-082-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.138
* | | | Merge pull request #4714 from sdodson/image-stream-syncOpenShift Bot2017-07-08100-1/+63835
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | xPaas v1.4.1 for 3.4Scott Dodson2017-07-0733-0/+21278
| | | | |
| * | | | xPaas v1.4.1 for 3.5Scott Dodson2017-07-0733-0/+21278
| | | | |
| * | | | xPaaS 1.4.1 for 3.6Scott Dodson2017-07-0734-1/+21279
| | | | |
* | | | | Merge pull request #4719 from abutcher/glusterfs-nodenameOpenShift Bot2017-07-073-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Use openshift.node.nodename as glusterfs_hostname.Andrew Butcher2017-07-073-4/+4
| | | | | |
* | | | | | Merge pull request #4703 from tbielawa/bz1468187Scott Dodson2017-07-071-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Run some basic etcd checks after migration to ensure leases are good
| * | | | | | Wait for etcd to become healthy before migrating TTLTim Bielawa2017-07-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1468187
* | | | | | | Merge pull request #4711 from tbielawa/bz1468424OpenShift Bot2017-07-071-8/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Merged by openshift-bot
| * | | | | | Only add entries to NO_PROXY settings if a NO_PROXY value is setTim Bielawa2017-07-071-8/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1468424 Incorrect indentation caused base svc/cluster.local/hostname entries to be added to the NO_PROXY settings regardless of if the user was configuring NO_PROXY or not.
* | | | | | Merge pull request #4716 from ewolinetz/fix_broker_configmapScott Dodson2017-07-071-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | updating configmap map definition to fix asb not starting up correctly
| * | | | | | updating configmap map definition to fix asb not starting up correctlyewolinetz2017-07-071-4/+4
| |/ / / / /
* | | | | | Merge pull request #4717 from ashcrow/fedora-container-moveScott Dodson2017-07-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | container-engine: Update Fedora registry url
| * | | | | container-engine: Update Fedora registry urlSteve Milner2017-07-071-1/+1
|/ / / / /
* | | | | Merge pull request #4692 from shawn-hurley/bugzilla-1467948Scott Dodson2017-07-072-2/+7
|\ \ \ \ \ | | | | | | | | | | | | 1467948 - Ansible Service Broker configuration values
| * | | | | fixing configuation values.Shawn Hurley2017-07-052-2/+7
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.137-1].Jenkins CD Merge Bot2017-07-072-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.137
* | | | | | Merge pull request #4702 from ashcrow/atomic-command-workaroundsScott Dodson2017-07-061-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Atomic command workarounds
| * | | | | Install container-selinux with container-engineSteve Milner2017-07-061-0/+6
|/ / / / /
* | | | | Merge pull request #4696 from richm/bug-1466152Scott Dodson2017-07-0611-24/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | Bug 1466152 - Json-file log driver: Neither "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries
| * | | | Bug 1466152 - Json-file log driver: Neither ↵Rich Megginson2017-07-0611-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries https://bugzilla.redhat.com/show_bug.cgi?id=1466152 Do not set openshift_logging_fluentd_use_journal or USE_JOURNAL at all unless it is explicitly set as an ansible param. It is almost always better to let fluentd figure out which log driver docker is using.
* | | | | Merge pull request #4531 from abutcher/f26-ah-setseboolOpenShift Bot2017-07-062-26/+76
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | Workaround seboolean module with setsebool command.Andrew Butcher2017-07-052-26/+76
| | | | |
* | | | | Merge pull request #4694 from ewolinetz/service_catalog_serialScott Dodson2017-07-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Adding serial: 1 to play to ensure we run one at a time
| * | | | | Adding serial: 1 to play to ensure we run one at a timeewolinetz2017-07-061-0/+1
|/ / / / /
* | | | | Merge pull request #4691 from sdodson/fix-travisScott Dodson2017-07-061-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix yamllint
| * | | | | Fix yamllintScott Dodson2017-07-061-10/+10
|/ / / / /
* | | | | Merge pull request #4681 from kwoodson/default_registry_env_fixScott Dodson2017-07-061-2/+11
|\ \ \ \ \ | | | | | | | | | | | | [BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting in env file.
| * | | | | Removed quotes and added env variable to be specific.Kenny Woodson2017-07-051-2/+2
| | | | | |
| * | | | | [BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting.Kenny Woodson2017-07-051-2/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #4680 from ingvagabund/set-label-of-var-lib-etcdJan Chaloupka2017-07-061-0/+15
|\ \ \ \ \ | | | | | | | | | | | | set the proper label of /var/lib/etcd directory
| * | | | | set the proper label of /var/lib/etcd directoryJan Chaloupka2017-07-051-0/+15
| |/ / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.6.136-1].Jenkins CD Merge Bot2017-07-062-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.136