summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5765 from abutcher/service-serving-cert-typoOpenShift Merge Robot2017-10-175-2/+42
|\ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure controllerConfig.serviceServingCert is correctly set during upgrade. A typo was originally introduced in https://github.com/openshift/openshift-ansible/pull/2449 causing an incorrect key to be configured within the master config. This commit ensures that the correct key is set during upgrades. /cc @dlbewley https://bugzilla.redhat.com/show_bug.cgi?id=1500981
| * Ensure controllerConfig.serviceServingCert is correctly set during upgrade.Andrew Butcher2017-10-135-2/+42
| |
* | Merge pull request #5768 from giuseppe/crio-error-out-with-node-docker-containerOpenShift Merge Robot2017-10-171-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. cri-o: error out when node is a Docker container Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1489555 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | cri-o: error out when node is a Docker containerGiuseppe Scrivano2017-10-161-0/+6
| | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1489555 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #5687 from jim-minter/tsb_configOpenShift Merge Robot2017-10-174-10/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Rewire openshift_template_service_broker_namespaces configurable @ewolinetz @bparees
| * | | Rewire openshift_template_service_broker_namespaces configurableJim Minter2017-10-134-10/+23
| | |/ | |/|
* | | Merge pull request #5744 from mgugino-upstream-stage/latest-image-configOpenShift Merge Robot2017-10-174-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add ability to set node and master imageConfig to latest Currently, imageConfig.latest is hard-coded to false. This commit adds an appropriate boolean to enable setting to true. Fixes: https://github.com/openshift/openshift-ansible/issues/1422
| * | | Add ability to set node and master imageConfig to latestMichael Gugino2017-10-124-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, imageConfig.latest is hard-coded to false. This commit adds an appropriate boolean to enable setting to true. Fixes: https://github.com/openshift/openshift-ansible/issues/1422
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.158.0].Jenkins CD Merge Bot2017-10-172-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #5704 from josefkarasek/docker-auditOpenShift Merge Robot2017-10-164-1/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add switch to enable/disable container engine's audit log being stored in elasticsearch If enabled, tho logs are stored in ES' operations index, accessible only by cluster admins.
| * | | | Add switch to enable/disable container engine's audit log being stored in ES.Josef Karasek2017-10-114-1/+32
| | | | | | | | | | | | | | | | | | | | If enabled, tho logs are stored in ES' operations index, accesible only by cluster admins.
* | | | | Merge pull request #5734 from mtnbikenc/refactor-mgmt-entryOpenShift Merge Robot2017-10-166-31/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Refactor openshift-management entry point Moves checkpointing steps into path for both full cluster install and individual entry point playbook.
| * | | | | Refactor openshift-management entry pointRussell Teague2017-10-126-31/+22
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.157.0].Jenkins CD Merge Bot2017-10-162-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5733 from ↵OpenShift Merge Robot2017-10-161-6/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/data-migrate-of-embedded-etcd-not-allowed Automatic merge from submit-queue. data migration of embedded etcd not allowed The v2->v3 migration of an embedded etcd is depricated. Instead, one needs to run: 1. `playbooks/byo/openshift-etcd/embedded2external.yml` to migrate the embedded etcd to an external one (see https://github.com/openshift/openshift-ansible/pull/5672) 2. then `playbooks/byo/openshift-etcd/migrate.yml` to migrate the v2 data to v3 data
| * | | | | | data migration of embedded etcd not allowedJan Chaloupka2017-10-121-6/+18
| |/ / / / /
* | | | | | Merge pull request #5667 from jarrpa/deploy-heketi-fix-3.7Scott Dodson2017-10-161-8/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | GlusterFS: remove topology reference from deploy-heketi
| * | | | | GlusterFS: remove topology reference from deploy-heketiJose A. Rivera2017-10-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.156.0].Jenkins CD Merge Bot2017-10-162-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5747 from ↵OpenShift Merge Robot2017-10-153-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/set-initial-etcd-cluster-properly-system-container-scale-up Automatic merge from submit-queue. Set initial etcd cluster properly during system container scale up When a cluster is scaled up, the ETCD_INITIAL_CLUSTER must not contain etcd members that are not about to start or are not part of the etcd cluster. Consolidating `initial_etcd_cluster` and `etcd_initial_cluster` as they do exactly the same. Bug: 1500667
| * | | | | | set initial etcd cluster properly during system container scale upJan Chaloupka2017-10-133-3/+4
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.155.0].Jenkins CD Merge Bot2017-10-152-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.154.0].Jenkins CD Merge Bot2017-10-142-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.153.0].Jenkins CD Merge Bot2017-10-132-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5735 from ↵Jan Chaloupka2017-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | ingvagabund/default-oo_new_etcd_to_config-to-empty-list Default groups.oo_new_etcd_to_config to an empty list
| * | | | | default groups.oo_new_etcd_to_config to an empty listJan Chaloupka2017-10-121-1/+1
| | |/ / / | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.152.0].Jenkins CD Merge Bot2017-10-132-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.151.0].Jenkins CD Merge Bot2017-10-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5414 from ekuric/pvc_dynamic_metricsOpenShift Merge Robot2017-10-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. updated dynamic storage section for openshift metrics updated dynamic storage section for openshift metrics to support storage class name Signed-off-by: Elvir Kuric <elvirkuric@gmail.com>
| * | | | | updated dynamic provision section for openshift metrics to supportElvir Kuric2017-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage class name Signed-off-by: Elvir Kuric <elvirkuric@gmail.com>
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.150.0].Jenkins CD Merge Bot2017-10-132-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5736 from ↵Michael Gugino2017-10-125-15/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/fix-containerized-reg-auth-node Fix containerized node service unit placement order
| * | | | | | Fix containerized node service unit placement orderMichael Gugino2017-10-125-15/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, non-containerized nodes have systemd service unit files created after registry auth credentials are created. Containerized nodes place service unit files prior to creation of these credentials. This commit ensures systemd service units are created at the correct time for both containerized and non-containerized nodes. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500642
* | | | | | Merge pull request #5740 from ↵OpenShift Merge Robot2017-10-121-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/ensure_docker_containerized_lb Automatic merge from submit-queue. Ensure docker is installed for containerized load balancers Currently, containerized load balancers may not have docker configured by openshift-ansible. This commit ensures that containerized load balancers have the openshift_docker role applied. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496756
| * | | | | | Ensure docker is installed for containerized load balancersMichael Gugino2017-10-121-1/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, containerized load balancers may not have docker configured by openshift-ansible. This commit ensures that containerized load balancers have the openshift_docker role applied. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496756
* | | | | | Merge pull request #5741 from mtnbikenc/fix-1484324OpenShift Merge Robot2017-10-121-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. 1484324 Ensure upgrade playbook exits on health check failures Adds `any_errors_fatal: true` https://bugzilla.redhat.com/show_bug.cgi?id=1484324
| * | | | | Ensure upgrade playbook exits on health check failuresRussell Teague2017-10-121-2/+4
| |/ / / / | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1484324
* | | | | Merge pull request #5690 from mgugino-upstream-stage/provisioning-docsOpenShift Merge Robot2017-10-129-183/+284
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Provisioning Documentation Updates Updating provisioning documents. Also moved some steps from build_ami.yml to a new play for better reusability.
| * | | | Provisioning Documentation UpdatesMichael Gugino2017-10-119-183/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating provisioning documents. Also moved some steps from build_ami.yml to a new play for better reusability.
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.149.0].Jenkins CD Merge Bot2017-10-122-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5727 from mtnbikenc/fix-1499254OpenShift Merge Robot2017-10-111-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. 1499254 Ensure host was reached for proper conditional validation If a host was unreachable during module setup, facts will not be initialized properly and will result in later failures when stepping through host groups. Verification that 'openshift' is defined will skip any hosts which were previously unreachable and did not have facts initialized. Fixes 1499254 https://bugzilla.redhat.com/show_bug.cgi?id=1499254
| * | | | | Ensure host was reached for proper conditional validationRussell Teague2017-10-111-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a host was unreachable during module setup, facts will not be initialized properly and will result in later failures when stepping through host groups. Verification that 'openshift' is defined will skip any hosts which were previously unreachable and did not have facts initialized. Fixes 1499254 https://bugzilla.redhat.com/show_bug.cgi?id=1499254
* | | | | Merge pull request #5672 from ingvagabund/migrate-embedded-etcdOpenShift Merge Robot2017-10-1128-63/+376
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Migrate embedded etcd to external etcd Trello card: https://trello.com/c/9fnBfkT5/528-migrate-embedded-etcd-hosts-to-external-process?menu=filter&filter=label:committed-3.7 Tested on: - [x] embedded etcd -> external rpm etcd - [x] embedded etcd -> external docker etcd One needs to set the `openshift_image_tag` before running the migration to containerized docker etcd.
| * | | | | Remove etcd health checkScott Dodson2017-10-101-20/+4
| | | | | |
| * | | | | migrate embedded etcd to external etcdJan Chaloupka2017-10-0628-63/+392
| | | | | |
* | | | | | Merge pull request #5716 from mgugino-upstream-stage/fix-debug_levelScott Dodson2017-10-1117-48/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken debug_level
| * | | | | | Fix broken debug_levelMichael Gugino2017-10-1117-48/+58
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, debug_level is documented as a way to change the debug output level for both masters and nodes. debug_level does not currently have any effect. This commit removes debug_level from openshift_facts and properly sets openshift_master_debug_level and openshift_node_debug_level to the value of debug_level specified in the inventory. This commit also reorganizes some set_fact tasks needed during master upgrades to put all work-around set-facts for undefined variables in one place, allowing for easier cleanup in the future. This includes an entry for openshift_master_debug_level. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500164
* | | | | | Merge pull request #5721 from mgugino-upstream-stage/fix-docker-iptablesScott Dodson2017-10-111-1/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Ensure docker service status actually changes
| * | | | | Ensure docker service status actually changesMichael Gugino2017-10-111-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, docker is started during the docker role. If docker is started during the run of the role, the handler to restart docker is not triggered to prevent excess restarts of the docker service. The systemd docker that starts the docker service may report the result of the task as 'changed' even though docker is already running and the state of the service itself does not change. This commit checks the status of the docker service before starting it to ensure that docker was not in an 'active' state according to systemd. If the docker service is already in the 'active' state, the restart handler will trigger and restart docker at the end of the run of the role. Fixes: https://github.com/openshift/origin/issues/16709
* | | | | | Merge pull request #5617 from simo5/up36roleOpenShift Merge Robot2017-10-113-11/+90
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Force reconciliation of role for 3.6 This is needed because in 3.6 we cannot reconcile non-cluster roles in the bootstrap reconciliation code. In 3.7 this is taken care of in code.