summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5983 from ewolinetz/37_bz1508150OpenShift Merge Robot2017-11-031-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Use the currently attached pvc for an ES dc if available Otherwise fall back to current logic of labelled PVCs or creating if necessary. This is to address https://bugzilla.redhat.com/show_bug.cgi?id=1508150 The order of the PVC priority is as follows: 1. The PVC currently claimed on the DC 1. A PVC from the list of PVCs as collected by logging_facts 1. Create a new PVC
| * Using the currently attached pvc for an ES dc if available, otherwise ↵Eric Wolinetz2017-11-011-2/+2
| | | | | | | | falling back to current logic
* | Merge pull request #5959 from sdodson/sc-asb-tsb-on-by-defaultOpenShift Merge Robot2017-11-037-11/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Enable SC, ASB, TSB by default It was decided that SC, ASB, and TSB should be installed by default. This will not install the components on an upgrade from 3.6 to 3.7, that will require that you run the sc playbook on your own. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1508085
| * | Use client binary and well defined kubeconfigScott Dodson2017-11-023-8/+8
| | |
| * | Ensure install and remove are mutually exclusive viaScott Dodson2017-11-021-0/+18
| | | | | | | | | | | | openshift_sanitize_inventory
| * | Enable SC, ASB, TSB by defaultScott Dodson2017-11-023-3/+3
| | | | | | | | | | | | This will not install the components on an upgrade.
* | | Merge pull request #5992 from abutcher/old-repo-fileOpenShift Merge Robot2017-11-031-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove old /etc/yum.repos.d/openshift_additional.repo file. Repos defined in `openshift_additional_repos` will be configured individually in their own files so we can remove the old multi-repo file.
| * | | Remove old /etc/yum.repos.d/openshift_additional.repo file.Andrew Butcher2017-11-021-0/+5
| | | |
* | | | Merge pull request #5995 from ashcrow/docker-gc-daemonsetOpenShift Merge Robot2017-11-037-0/+122
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. openshift_hosted: Add docker-gc Two new inventory variables have been created: - ``openshift_crio_enable_docker_gc``: Enable docker_gc daemon set - ``openshift_crio_docker_gc_node_selector``: Optional dictionary to use node selector When ``openshift_crio_enable_docker_gc`` and ``openshift_use_crio`` are both true then ``docker_gc`` daemonset will be created along with adding a ``docker-gc`` sa.
| * | | | openshift_hosted: Add docker-gcSteve Milner2017-11-027-0/+122
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two new inventory variables have been created: - openshift_crio_enable_docker_gc: Enable docker_gc daemon set - openshift_crio_docker_gc_node_selector: Optional dictionary to use node selector When openshift_crio_enable_docker_gc and openshift_use_crio are both true then dockergc daemonset will be created along with adding a dockergc sa. Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | Merge pull request #5999 from mgugino-upstream-stage/fix-etcd-upgradeScott Dodson2017-11-031-1/+1
|\ \ \ \ | | | | | | | | | | Correct groupname during upgrade_control_plane play
| * | | | Correct groupname during upgrade_control_plane playMichael Gugino2017-11-031-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, upgrade_control_plane calls tasks meant for master on etcd group. This commit corrects the groupname. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508734
* | | | Merge pull request #5945 from kwoodson/elb_fixesOpenShift Merge Robot2017-11-038-64/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fixing elb creation for infra and adding to scale group. Elb creation was missing for the infra nodes. This was either an issue with a refactor or it was missed. The other issue was that after instances were removed and re-added via a scale group the ELB no longer referenced those hosts. This PR names the ELBs so they are automatically tied to a scale group instead of an instance. This allows for instances to come and go but the ELBs will continue to work with all new instances in the ASG.
| * | | | Adding elb changes to provision elbs and add to scale group.Kenny Woodson2017-11-018-64/+74
| | | | |
* | | | | Merge pull request #5989 from tbielawa/bz1506951OpenShift Merge Robot2017-11-031-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. CFME: Use cluster_hostname if cluster_public_hostname isn't available The CFME 'automatically add provider' playbook would fail if openshift_master_cluster_public_hostname was not defined in the inventory. Now we use that value if it is available, and fallback to using the masters 'cluster_hostname' otherwise. * Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506951
| * | | | | CFME: Use cluster_hostname if cluster_public_hostname isn't availableTim Bielawa2017-11-021-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CFME 'automatically add provider' playbook would fail if openshift_master_cluster_public_hostname was not defined in the inventory. Now we use that value if it is available, and fallback to using the masters 'cluster_hostname' otherwise. * Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506951
* | | | | | Merge pull request #5977 from ↵OpenShift Merge Robot2017-11-032-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staebler/1507598-patch_permissions_for_service_catalog Automatic merge from submit-queue. Give admin and edit roles permission to patch ServiceInstances and ServiceBindings Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1507598.
| * | | | | | Give admin and edit roles permission to patch ServiceInstances and ↵staebler2017-11-012-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ServiceBindings
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.191.0].Jenkins CD Merge Bot2017-11-032-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5979 from kwoodson/move_node_config_locationOpenShift Merge Robot2017-11-022-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Configurable node config location. Allow the node config location to be configurable. This currently defaults to /var/lib/origin. It should be /etc/origin/node/node-config.yaml.
| * | | | | | | Adding CONFIG_FILE option back.Kenny Woodson2017-11-012-3/+6
| | | | | | | |
| * | | | | | | Configurable node config location.Kenny Woodson2017-11-011-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5969 from sdodson/prom-imagesOpenShift Merge Robot2017-11-024-10/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add enterprise prometheus image defaults, simplify image_prefix Only require that openshift_prometheus_image_prefix be set to affect all other prefixes. Unfortunately the image_version for origin varies by image so a common image_version cannot be used.
| * | | | | | | Add enterprise prometheus image defaultsScott Dodson2017-11-014-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only require that openshift_prometheus_image_prefix be set to affect all other prefixes. Unfortunately the image_version for origin varies by image so a common image_version cannot be used.
* | | | | | | | Merge pull request #5665 from oybed/metaScott Dodson2017-11-021-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Adding meta/main.yml to allow for Galaxy use of this repo
| * | | | | | | Adding meta/main.yml to allow for Galaxy use of this repoØystein Bedin2017-10-041-0/+2
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.190.0].Jenkins CD Merge Bot2017-11-022-2/+23
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5715 from jarrpa/registry-storage-doc-fixScott Dodson2017-11-021-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | GlusterFS: Fix registry storage documentation
| * | | | | | | GlusterFS: Fix registry storage documentationJose A. Rivera2017-10-101-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | Merge pull request #5982 from ↵Scott Dodson2017-11-011-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/check-v2-snapshot-presence-before-data-migration check presence of v2 snapshot before the migration proceeds
| * | | | | | | | check presence of v2 snapshot before the migration proceedsJan Chaloupka2017-11-011-0/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #5978 from abutcher/openshift-ca-factsOpenShift Merge Robot2017-11-011-3/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove delegate_to from openshift_facts within the openshift_ca role. Just reload facts on all hosts when we've updated the base package on the first master. https://bugzilla.redhat.com/show_bug.cgi?id=1507083
| * | | | | | | | Remove delegate_to from openshift_facts within the openshift_ca role.Andrew Butcher2017-11-011-3/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5972 from smarterclayton/default_mtuOpenShift Merge Robot2017-11-011-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. MTU for bootstrapping should default to openshift_node_sdn_mtu The default value needs to be consistently used. @kwoodson
| * | | | | | | MTU for bootstrapping should default to openshift_node_sdn_mtuClayton Coleman2017-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value needs to be consistently used.
* | | | | | | | Merge pull request #5971 from smarterclayton/retry_createOpenShift Merge Robot2017-11-011-0/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Retry service account bootstrap kubeconfig creation Pulled back from the larger refactor so this job can be enabled. @kwoodson back porting so I can turn the job on
| * | | | | | | Retry service account bootstrap kubeconfig creationClayton Coleman2017-10-311-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Pulled back from the larger refactor so this job can be enabled.
* | | | | | | Merge pull request #5974 from tbielawa/bz1504535OpenShift Merge Robot2017-11-011-5/+19
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Don't use possibly undefined variables in error messages In an error reporting task we were referencing a variable which may not have been defined. Even though NFS server detection was working correctly the undefined variable reference caused an AnsibleUndefinedVariable error. * Fixes CFME failing to deploy using external NFS storage https://bugzilla.redhat.com/show_bug.cgi?id=1504535
| * | | | | | Don't use possibly undefined variables in error messagesTim Bielawa2017-11-011-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an error reporting task we were referencing a variable which may not have been defined. Even though NFS server detection was working correctly the undefined variable reference caused an AnsibleUndefinedVariable error. * Fixes CFME failing to deploy using external NFS storage https://bugzilla.redhat.com/show_bug.cgi?id=1504535
* | | | | | | Merge pull request #5938 from ↵Scott Dodson2017-11-013-2/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staebler/1506976-watch_serviceinstance_in_view_role Add rules to the view ClusterRole for service catalog.
| * | | | | | | Add rules to the view ClusterRole for service catalog.staebler2017-10-303-2/+36
| | | | | | | |
* | | | | | | | Merge pull request #5264 from AlexanderZagaynov/cors_escapeOpenShift Merge Robot2017-11-011-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. escape corsAllowedOrigins regexp strings and anchor them `corsAllowedOrigins` parameter got interpreted by OpenShift/Kubernetes as a regular expression (there is a bug about that: https://bugzilla.redhat.com/show_bug.cgi?id=1482903). It leads to some vague behaviour, like for `127.0.0.1` value `127a0b0c1` will be matched as valid, as well as `localhost.example.com` for `localhost`. I've added regexp escaping here, as well as value anchoring to the begin and end of the string. I've also added case-insensitive flag `(?i)` to match values like `LocalHost` for `localhost`.
| * | | | | | | | fix comment and make it visible to end-userAlexander Zagaynov2017-09-051-2/+3
| | | | | | | | |
| * | | | | | | | escape also custom_cors_originsAlexander Zagaynov2017-08-301-1/+1
| | | | | | | | |
| * | | | | | | | add comment on regexp specificsAlexander Zagaynov2017-08-301-1/+1
| | | | | | | | |
| * | | | | | | | escape corsAllowedOrigins regexp strings and anchor themAlexander Zagaynov2017-08-301-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5912 from ewolinetz/update_console_flagsScott Dodson2017-11-011-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Updating console OPENSHIFT_CONSTANTS flag for TSB
| * | | | | | | | Updating console OPENSHIFT_CONSTANTS flag for TSBEric Wolinetz2017-10-271-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5955 from ↵OpenShift Merge Robot2017-11-012-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/remove-docker-etc-containers-regs Automatic merge from submit-queue. Docker: make use of new etc/containers/registries.conf optional Currently, not all versions of docker support using /etc/containers/registries.conf This commit makes the use of that file optional.
| * | | | | | | | | Docker: make use of new etc/containers/registries.conf optionalMichael Gugino2017-10-312-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, not all versions of docker support using /etc/containers/registries.conf This commit makes the use of that file optional.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 00:14:16 +0000