summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.189.0].Jenkins CD Merge Bot2017-11-012-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5953 from sdodson/bind-dynamicOpenShift Merge Robot2017-10-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Switch from bind-interfaces to bind-dynamic
| * | | | | | | | Switch from bind-interfaces to bind-dynamicScott Dodson2017-10-311-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5956 from smarterclayton/delete_build_istanceClayton Coleman2017-10-311-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Ensure GCP image build instance gets cleaned up on teardown
| * | | | | | | | Ensure GCP image build instance gets cleaned up on teardownClayton Coleman2017-10-311-0/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #5957 from kwoodson/doc_fix_cert_requiredScott Dodson2017-10-311-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Stating that certificate it is required when doing SSL on ELB.
| * | | | | | | | | Stating that certificate it is required when doing SSL on ELB.Kenny Woodson2017-10-311-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5949 from mgugino-upstream-stage/ha_controller_ttlOpenShift Merge Robot2017-10-312-4/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unused osm_controller_lease_ttl This variable is no longer used and references should be removed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507449
| * | | | | | | | Remove unused osm_controller_lease_ttlMichael Gugino2017-10-312-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable is no longer used and references should be removed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507449
* | | | | | | | | Merge pull request #4571 from wongma7/efs-followMichael Gugino2017-10-317-17/+22
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Add blank storageClassName to provisioner PVC & PV template
| * | | | | | | | Give PV & PVC empty storage class to avoid being assigned default gp2Matthew Wong2017-10-272-0/+2
| | | | | | | | |
| * | | | | | | | Use oc_project to ensure openshift_provisioners_project presentMatthew Wong2017-10-271-12/+5
| | | | | | | | |
| * | | | | | | | Fix yaml formattingMatthew Wong2017-10-274-5/+15
| | | | | | | | |
* | | | | | | | | Merge pull request #5936 from sdodson/arbitrary-fw-rulesOpenShift Merge Robot2017-10-312-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add arbitrary firewall port config to master too
| * | | | | | | | | Add arbitrary firewall port config to master tooScott Dodson2017-10-302-1/+9
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5929 from ↵OpenShift Merge Robot2017-10-312-10/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/remove-master-service-during-non-ha-to-ha-upgrade Automatic merge from submit-queue. remove master.service during the non-ha to ha upgrade Bug: 1506165
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 19:08:33 +0000