summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6797 from sdodson/bz1523638OpenShift Merge Robot2018-01-224-4/+4
|\ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Adjust registry-console's prefix to be fully qualified 3 commits for easy cherry-picking into release-3.7 and release-3.6 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1523638
| * Fix enterprise registry-console prefixScott Dodson2018-01-192-2/+2
| |
| * [release-3.7] Fix enterprise registry console image prefixScott Dodson2018-01-191-1/+1
| |
| * [release-3.6] Fix enterprise registry console image prefixScott Dodson2018-01-191-1/+1
| |
* | Merge pull request #6793 from mgugino-upstream-stage/fix-master-scaleupOpenShift Merge Robot2018-01-222-10/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix master scaleup This commit builds off https://github.com/openshift/openshift-ansible/pull/6784 Enables openshift-master/scaleup.yml to call prerequisites.yml as required. Also modifies some failure conditions around how scaleup plays are called to ensure inventories are better aligned with playbook behavior.
| * | Fix master scaleup playMichael Gugino2018-01-192-10/+39
| | | | | | | | | | | | | | | | | | | | | Allow playbooks/openshift-master/scaleup.yml to call prerequisites.yml at the proper time. Related-to: https://github.com/openshift/openshift-ansible/pull/6784
* | | Merge pull request #6798 from nhosoi/bz1512825OpenShift Merge Robot2018-01-222-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1512825 - add mux pod failed for Serial number 02 has already been issued According to mkhan@redhat.com, to run the "oc adm ca create-server-cert" command line with --signer-serial option, the following changes need to be made. 1. adding --overwrite=false 2. <ca.serial.txt> should contain only [0-9A-F]*. (no trailing newlines are allowed for now) This patch solves 1.
| * | | Bug 1512825 - add mux pod failed for Serial number 02 has already been issuedNoriko Hosoi2018-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to mkhan@redhat.com, to run the "oc adm ca create-server-cert" command line with --signer-serial option, the following changes need to be made. 1. adding --overwrite=false 2. <ca.serial.txt> should contain only [0-9A-F]*. (no trailing newlines are allowed for now) This patch solves 1.
* | | | Merge pull request #6525 from luis5tb/fix-provider-networkMichael Gugino2018-01-222-9/+17
|\ \ \ \ | | | | | | | | | | Fix provider network support at openstack playbook
| * | | | Fix provider network support at openstack playbookLuis Tomas Bolivar2018-01-082-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | It ensures no floating ips are attached if a provider network is used
* | | | | Merge pull request #6806 from spadgett/console-node-selectorOpenShift Merge Robot2018-01-212-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1536262: Default console and TSB node selector to openshift_hosted_infra_selector Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536262 Fixes #6805 /kind bug /assign @sdodson @jupierce You should no longer need to set `openshift_web_console_nodeselector` when this merges. @bparees @jim-minter FYI, I switched the TSB default as well.
| * | | | | Bug 1536262: Default console and TSB node selector to ↵Samuel Padgett2018-01-212-3/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | openshift_hosted_infra_selector Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536262
* | | | | Merge pull request #6754 from spadgett/remove-old-console-configOpenShift Merge Robot2018-01-206-58/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove obsolete properties from console config map Stop writing deprecated config to the console config map. /hold This can't be merged until https://github.com/openshift/origin-web-console-server/pull/20 merges. Follow on to https://github.com/openshift/openshift-ansible/pull/6730
| * | | | | Remove old console asset configSamuel Padgett2018-01-196-58/+12
| | | | | | | | | | | | | | | | | | | | | | | | Stop writing deprecated config to the console config map.
* | | | | | Merge pull request #6792 from mtnbikenc/fix-1533099Michael Gugino2018-01-201-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | [1533099] Add support for Amazon EC2 C5 instance types
| * | | | | | Add support for Amazon EC2 C5 instance typesRussell Teague2018-01-191-0/+5
| | | | | | |
* | | | | | | Merge pull request #6799 from spadgett/console-admin-kubeconfigOpenShift Merge Robot2018-01-201-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1536253: Pass `--config` flag on oc commands when installing console Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536253 /assign @sdodson /kind bug @jupierce cc
| * | | | | | | Bug 1536253: Pass `--config` flag on oc commands when installing consoleSamuel Padgett2018-01-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536253
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.22.0].Jenkins CD Merge Bot2018-01-192-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6763 from sdodson/allow-firewalld-with-overrideOpenShift Merge Robot2018-01-191-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow for firewalld on atomic host Right now this is only available on fedora so guard it with openshift_enable_unsupported_configurations
| * | | | | | | Allow for firewalld on atomic hostScott Dodson2018-01-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now this is only available on fedora so guard it with openshift_enable_unsupported_configurations
* | | | | | | | Merge pull request #6784 from mgugino-upstream-stage/fix-node-scaleupMichael Gugino2018-01-1913-17/+43
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix node scaleup plays
| * | | | | | | Fix node scaleup playsMichael Gugino2018-01-1813-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users have no way to run preqrequisites.yml on just newly added nodes during scaleup. This commit ensures only the new nodes are changed during scaleup as well as ensure prerequisites are run.
* | | | | | | | Merge pull request #6691 from abutcher/oc-adm-csr-cnAndrew Butcher2018-01-192-37/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use master group's ansible_ssh_user when accepting nodes.
| * | | | | | | | Remove duplication in node acceptance playbook and setup master groups so ↵Andrew Butcher2018-01-162-37/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that we can use the first master's ansible_ssh_user when delegating.
* | | | | | | | | Merge pull request #6794 from tomassedovic/fix-readmeMichael Gugino2018-01-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix OpenStack readme
| * | | | | | | | | Fix OpenStack readmeTomas Sedovic2018-01-191-1/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ansible-playbook command in the OpenStack readme is missing a trailing backslash after the dynamic inventory. This prevents being able to copy/paste the command into the terminal and just run it as is.
* | | | | | | | | Merge pull request #6789 from vrutkovs/quick-installer-disable-upgradeOpenShift Merge Robot2018-01-192-103/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Quick installer: deprecate upgrades
| * | | | | | | | Quick installer: deprecate upgradesVadim Rutkovsky2018-01-192-103/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output a link to manual deprecate docs when `atomic-openshift-installer upgrade` is called
* | | | | | | | | Merge pull request #6755 from vrutkovs/packages-containerizedScott Dodson2018-01-191-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Use openshift_is_containerized instead of openshift_is_atomic when working with packages
| * | | | | | | | Use openshift_is_containerized instead of openshift_is_atomic when ↵Vadim Rutkovsky2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installing etcd This allows non-Atomic hosts to be used to install containerized etcd
* | | | | | | | | Merge pull request #6771 from tomassedovic/fix-readmeOpenShift Merge Robot2018-01-191-5/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Drop the testing repo var from openstack readme This was introduced as a temporary fix for the origin+centos deployments. It is no longer necessary and it's confusing to newcomers.
| * | | | | | | | Drop the testing repo var from openstack readmeTomas Sedovic2018-01-181-5/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced as a temporary fix for the origin+centos deployments. It is no longer necessary and it's confusing to newcomers.
* | | | | | | | Merge pull request #6765 from jcantrill/bz1523047_annotate_logging_prefixOpenShift Merge Robot2018-01-181-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. bug 1523047. Annotate ops projects with an .operation prefix
| * | | | | | | | bug 1523047. Annotate ops projects with an .operation prefixJeff Cantrill2018-01-171-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #6785 from spadgett/tsb-redeploy-consoleOpenShift Merge Robot2018-01-184-11/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Rollout console after template service broker install The console will discover if the broker is running, but only on startup. Trigger a rollout so that the console sees the change. /assign @sdodson cc @jwforres @deads2k @bparees
| * | | | | | | | | Rollout console after template service broker installSamuel Padgett2018-01-184-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The console will discover if the broker is running, but only on startup. Trigger a rollout so that the console sees the change.
* | | | | | | | | | Merge pull request #6709 from jmencak/tuned-29OpenShift Merge Robot2018-01-181-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Automatic profile setting for tuned 2.9 Tuned 2.9 introduces automatic and manual profile selection. If there is file /etc/tuned/profile_mode containing "manual" on a system with tuned 2.9, without this PR the appropriate OCP profiles will not be set. This PR removes the file prior to tuned restart, in addition to /etc/tuned/active_profile to make the tuned profile selection automatic.
| * | | | | | | | | | Automatic profile setting for tuned 2.9Jiri Mencak2018-01-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tuned 2.9 introduces automatic and manual profile selection. If there is a file /etc/tuned/profile_mode containing "manual" on a system with tuned 2.9, without this PR the appropriate OCP profiles will not be set. This PR removes the file prior to tuned restart, in addition to /etc/tuned/active_profile to make the tuned profile selection automatic.
* | | | | | | | | | | Merge pull request #6775 from spadgett/fix-task-nameOpenShift Merge Robot2018-01-182-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1535947: Fix missing task in metrics, logging uninstall playbooks Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1535947 /assign @sdodson
| * | | | | | | | | | | Bug 1535947: Fix missing task in metrics, logging uninstall playbooksSamuel Padgett2018-01-182-8/+8
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1535947
* | | | | | | | | | | Merge pull request #6760 from mgugino-upstream-stage/fix-docker-atomic-proxiesOpenShift Merge Robot2018-01-182-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure atomic_proxies are configured with docker In some setups, system containers may be used in conjunction with package_docker. This commit ensures that the atomic proxies are configured while using package_docker and containerized components. This commit also ensures containerized_groups are based on openshift_is_containerized instead of 'containerized' variable directly to account for possible use of atomic hosts which users may not specify containerized in inventory directly. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1535323
| * | | | | | | | | | | Ensure atomic_proxies are configured with dockerMichael Gugino2018-01-172-1/+12
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some setups, system containers may be used in conjunction with package_docker. This commit ensures that the atomic proxies are configured while using package_docker and containerized components. This commit also ensures containerized_groups are based on openshift_is_containerized instead of 'containerized' variable directly to account for possible use of atomic hosts which users may not specify containerized in inventory directly. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1535323
* | | | | | | | | | | Merge pull request #6488 from vrutkovs/utils-test-flake8OpenShift Merge Robot2018-01-185-156/+174
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix flake8 errors in utils/test
| * | | | | | | | | | | Fix flake8 errors in utils/testVadim Rutkovsky2018-01-045-156/+174
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6774 from sdodson/webconsole-image-prefixScott Dodson2018-01-182-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | Make openshift_web_console_prefix defaults like other components
| * | | | | | | | | | | Make openshift_web_console_prefix defaults like other componentsScott Dodson2018-01-182-4/+4
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other components are like 'registry.access.redhat.com/ose-' or 'openshift/origin-' based on OCP versus Origin.
* | | | | | | | | | | Merge pull request #6745 from shawn-hurley/secret-reg-authOpenShift Merge Robot2018-01-181-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1509082 - Adding auth as a secret If username and password are defined we should use a secret for the credentials.
| * | | | | | | | | | adding check if secret auth is neededShawn Hurley2018-01-161-2/+8
| | | | | | | | | | |
| * | | | | | | | | | adding asb auth as a secret.Shawn Hurley2018-01-161-0/+2
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 08:41:28 +0000