summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5781 from mgugino-upstream-stage/fix-reg-auth-templatingScott Dodson2017-10-233-3/+12
|\ | | | | Ensure proper variable templating for skopeo auth credentials
| * Ensure proper variable templating for skopeo auth credentialsMichael Gugino2017-10-173-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, docker_image_availability.py plugin check is using the raw strings for variables from task_vars. This results in any variables that utilized within the plugin to be un-templated. For instance, if variable "x" is set to "{{ y }}" and y is set to "2", one would expect that x == 2 inside the plugin. Currently, the plugin will use the string "{{ y }}" for the value of x instead of templating the variable. This commit ensures skopeo registry auth credentials are templated properly. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500698
* | Merge pull request #5811 from zgalor/add_nfs_to_readmeScott Dodson2017-10-231-2/+25
|\ \ | | | | | | Add nfs variables documentation to README file
| * | Add nfs variables documentation to README fileZohar Galor2017-10-191-2/+25
| | | | | | | | | | | | Add documentation of external nfs variables
* | | Merge pull request #5845 from ingvagabund/check-correct-master-servicesScott Dodson2017-10-231-12/+25
|\ \ \ | | | | | | | | Check if the master service is non-ha or not
| * | | Check if the master service is non-ha or notJan Chaloupka2017-10-231-12/+25
| | | |
* | | | Merge pull request #5822 from ewolinetz/bz1504191Scott Dodson2017-10-231-1/+1
|\ \ \ \ | | | | | | | | | | Updating to use same image as origin until enterprise image is built
| * | | | Updating ocp es proxy image to use openshift_logging_proxy_image_prefix if ↵Eric Wolinetz2017-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | specified
* | | | | Merge pull request #5453 from giuseppe/use-docker-cli-image-if-already-availableOpenShift Merge Robot2017-10-231-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. cli: do not pull again the image when using Docker When CRI-O is used and the CLI image is already pulled into Docker then use it also for copying the CLI files to the host instead of pulling it once again in the ostree storage. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | cli: use the correct name for the master system containerGiuseppe Scrivano2017-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | cli: do not pull again the image when using DockerGiuseppe Scrivano2017-10-231-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CRI-O is used and the CLI image is already pulled into Docker then use it also for copying the CLI files to the host instead of pulling it once again in the ostree storage. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #5844 from mtnbikenc/fix-1504515Scott Dodson2017-10-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | 1504515 Correct host group for controller restart
| * | | | | | Correct host group for controller restartRussell Teague2017-10-231-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 1504515 https://bugzilla.redhat.com/show_bug.cgi?id=1504515
* | | | | | Merge pull request #5843 from ingvagabund/set-the-correct-etcd-ip-addressScott Dodson2017-10-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set the proper external etcd ip address when migrating embeded etcd
| * | | | | | Set the proper external etcd ip address when migrating embeded etcdJan Chaloupka2017-10-231-1/+1
| |/ / / / /
* / / / / / Automatic commit of package [openshift-ansible] release [3.7.0-0.176.0].Jenkins CD Merge Bot2017-10-232-2/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5241 from hansmi/masterScott Dodson2017-10-234-0/+37
|\ \ \ \ \ | | | | | | | | | | | | Add variable to control whether NetworkManager hook is installed
| * | | | | Add variable to control whether NetworkManager hook is installedMichael Hanselmann2017-10-194-0/+37
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | We control /etc/resolv.conf and parts of the dnsmasq configuration via Puppet in our environment. The hook ends up overwriting the managed configuration.
* | | | | Merge pull request #5818 from ashcrow/1503860OpenShift Merge Robot2017-10-232-8/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. docker: Move enterprise registry from pkg to main
| * | | | | docker: Move enterprise registry from pkg to mainSteve Milner2017-10-192-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503860 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | Merge pull request #5761 from fabianvf/asb-client-secret-not-foundScott Dodson2017-10-234-22/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bug 1496426 - Update ansible-service-broker configuration to use proper certs and permissions
| * | | | | | Update defaultsFabian von Feilitzsch2017-10-194-5/+9
| | | | | | |
| * | | | | | Use service-ca.crt instead of master ca.crtFabian von Feilitzsch2017-10-191-16/+11
| | | | | | |
| * | | | | | use master certFabian von Feilitzsch2017-10-191-2/+2
| | | | | | |
| * | | | | | Bug 1496426 - add asb-client secret to openshift-ansible-service-broker ↵Fabian von Feilitzsch2017-10-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace
* | | | | | | 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
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 05:59:04 +0000