summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7155 from enj/enj/i/revert_overwrite_certs/1512825OpenShift Merge Robot2018-02-142-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Revert "Bug 1512825 - add mux pod failed for Serial number 02 has already been issued" @sdodson @nhosoi This reverts #6798 as we are not changing the default in origin https://github.com/openshift/origin/pull/18405. This reverts commit ac23e6e362d8758032c1dd573d0ff6a958445df5. That commit introduced a backwards incompatible change to how the commands run. This undoes that. The original change was not required to prevent overwriting of the serial file. Bug 1512825
| * Revert "Bug 1512825 - add mux pod failed for Serial number 02 has already ↵Monis Khan2018-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | been issued" This reverts commit ac23e6e362d8758032c1dd573d0ff6a958445df5. That commit introduced a backwards incompatible change to how the commands run. This undoes that. The original change was not required to prevent overwriting of the serial file. Bug 1512825
* | Merge pull request #7097 from ewolinetz/logging_fresh_lg_cluster_fixOpenShift Merge Robot2018-02-144-10/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Whenever we create a new es node ignore health checks, changing prome… …theus pw gen for increased secret idempotency Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1540099 Whenever we are in a cluster sized > 1 the nodes required for recovery > 1. So when we have a fresh install we will not see the cluster start up because the number of required nodes is not met. Whenever we are creating a new node, we do not wait for the health check so that the logging playbook can complete and we can roll out all updated nodes. Also addresses prometheus pw generation so that each rerun of the playbook doesn't change the secret which triggers a full rollout of the cluster (assumes that keys/certs have changed).
| * | Whenever we create a new es node ignore health checks, changing prometheus ↵Eric Wolinetz2018-02-134-10/+29
| | | | | | | | | | | | pw gen for increased secret idempotency
* | | Merge pull request #7124 from mgugino-upstream-stage/fix-version-multiOpenShift Merge Robot2018-02-149-61/+103
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix version multi Simplify double upgrade version logic Currently, double upgrade process (3.7 -> 3.9) for control plane attempts to run openshift_version role twice to set the appropriate values for upgrading each major version, 3.8 and 3.9. This commit instructs openshift_version to only inquire about the proper settings for 3.9, and hard-sets the appropriate values for 3.8. This allows a simplification of the openshift_version role, allowing for easier debugging. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542368
| * | Simplify double upgrade version logicMichael Gugino2018-02-138-45/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, double upgrade process (3.7 -> 3.9) for control plane attempts to run openshift_version role twice to set the appropriate values for upgrading each major version, 3.8 and 3.9. This commit instructs openshift_version to only inquire about the proper settings for 3.9, and hard-sets the appropriate values for 3.8. This allows a simplification of the openshift_version role, allowing for easier debugging. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542368
| * | Revert openshift_version to previous stateMichael Gugino2018-02-125-21/+8
| | |
* | | Merge pull request #7135 from abutcher/node-accept-failOpenShift Merge Robot2018-02-143-0/+15
|\ \ \ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. oc_adm_csr: allow requesting module failure when timeout reached
| * | | oc_adm_csr: Add fail_on_timeout parameter which causes module to fail when ↵Andrew Butcher2018-02-133-0/+15
| | |/ | |/| | | | | | | timeout was reached.
* | | Merge pull request #7140 from kwoodson/yedit_json_filesOpenShift Merge Robot2018-02-1432-188/+560
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Adding ability to yedit json files. Adding feature of modifying json to yedit. Generated files makes this appear large. There are approximately 8 real lines of change.
| * | | Adding ability to yedit json files.Kenny Woodson2018-02-1332-188/+560
| | | |
* | | | Merge pull request #7143 from tomassedovic/openstack-shade-usageOpenShift Merge Robot2018-02-141-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix metadata access in OpenStack inventory Some versions of shade (e.g. the one currently in RHEL) only allow a dict-like interface.
| * | | Fix metadata access in OpenStack inventoryTomas Sedovic2018-02-141-1/+1
|/ / / | | | | | | | | | | | | Some versions of shade (e.g. the one currently in RHEL) only allow a dict-like interface.
* | | Merge pull request #7133 from ewolinetz/logging_eventrouter_template_fixOpenShift Merge Robot2018-02-131-0/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Adding missing template Adding missing template. Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1544657
| * | | Adding missing templateEric Wolinetz2018-02-131-0/+109
| | | |
* | | | Merge pull request #7130 from kwoodson/preinstall_rpmsOpenShift Merge Robot2018-02-133-8/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Move installation of packages before container_runtime to ensure bind mounts are avaialable.
| * | | | Move installation of packages before container_runtime to ensure bind mounts ↵Kenny Woodson2018-02-133-8/+13
| | | | | | | | | | | | | | | | | | | | are avaialable.
* | | | | Merge pull request #6918 from SaravanaStorageNetwork/uninstall_playbookOpenShift Merge Robot2018-02-138-101/+244
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Uninstall playbook for Glusterfs Uninstall playbook for Glusterfs
| * | | | erase data only if variable is set.Saravanakumar Arumugam2018-02-072-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix block indentatation Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
| * | | | uninstall playbook for GlusterFSSaravanakumar Arumugam2018-02-078-101/+240
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
* | | | | Merge pull request #7106 from jarrpa/pvc-gen-storageclassOpenShift Merge Robot2018-02-132-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow for blank StorageClass in PVC creation In the case where a default StorageClass is already defined and a PV's storage kind is not 'dynamic', allows for the storageClassName of the associated PVC to be blank so as to not use the default SC. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1544387 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | Allow for blank StorageClass in PVC creationJose A. Rivera2018-02-122-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where a default StorageClass is already defined and a PV's storage kind is not 'dynamic', allows for the storageClassName of the associated PVC to be blank so as to not use the default SC. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #7116 from mgugino-upstream-stage/fix-docker-upgradeOpenShift Merge Robot2018-02-134-9/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix docker_upgrade variable Currently, docker_upgrade is ignored during cluster upgrades. This commit ensures that the variable is respected. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1543714
| * | | | | Fix docker_upgrade variableMichael Gugino2018-02-124-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, docker_upgrade is ignored during cluster upgrades. This commit ensures that the variable is respected. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1543714
* | | | | | Merge pull request #7121 from sdodson/fix-registry-cert-redeployKenny Woodson2018-02-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Invert logic to decide when to re-deploy certs
| * | | | | | Invert logic to decide when to re-deploy certsScott Dodson2018-02-121-1/+1
| | | | | | |
* | | | | | | Merge pull request #6951 from tomassedovic/fix-openstack-masterOpenShift Merge Robot2018-02-133-12/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix OpenStack playbooks This shuffles a few playbooks around to fix the ordering between various facts and prerequisites.
| * | | | | | | Remove cluster_facts.yml from the install.ymlTomas Sedovic2018-02-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was moved there by accident. There's no reason to have it there explicitly.
| * | | | | | | Fix OpenStack playbooksTomas Sedovic2018-02-123-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shuffles a few playbooks around to fix the ordering between various facts and prerequisites.
* | | | | | | | Merge pull request #5251 from celebdor/configurable_node_startOpenShift Merge Robot2018-02-132-5/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Make node start options configurable Thanks to this, the node startup can be customized. Change-Id: Ifb93bf892d7de52a575b8d0231328d44f733d0aa Signed-off-by: Antoni Segura Puimedon <celebdor@gmail.com>
| * | | | | | | | Make node start options configurableAntoni Segura Puimedon2017-12-212-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to this, the node startup can be customized. Change-Id: Ifb93bf892d7de52a575b8d0231328d44f733d0aa Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
* | | | | | | | | Merge pull request #7122 from mgugino-upstream-stage/add-gcp-multizone-varOpenShift Merge Robot2018-02-134-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add openshift_gcp_multizone bool Add openshift_gcp_multizone bool that defaults to False to enable users to support multizone deployments on gcp. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542843
| * | | | | | | | | Add openshift_gcp_multizone boolMichael Gugino2018-02-124-2/+5
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add openshift_gcp_multizone bool that defaults to False to enable users to support multizone deployments on gcp. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542843
* | | | | | | | | Merge pull request #7117 from mgugino-upstream-stage/fix-gcp-varsOpenShift Merge Robot2018-02-121-4/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix gcp variable warnings This commit ensures that user get better information regarding variables that need to be defined in inventory when using gcp. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1541589
| * | | | | | | | | Fix gcp variable warningsMichael Gugino2018-02-121-4/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that user get better information regarding variables that need to be defined in inventory when using gcp. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1541589
* | | | | | | | | Merge pull request #7095 from jpeeler/upgrade-catOpenShift Merge Robot2018-02-121-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add service catalog to be upgraded Currently service catalog was left running at the previous version. https://bugzilla.redhat.com/show_bug.cgi?id=1541247
| * | | | | | | | | Add service catalog to be upgradedJeff Peeler2018-02-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently service catalog was left running at the previous version.
* | | | | | | | | | Merge pull request #7119 from vrutkovs/etcd-scaleup-ansible-nameOpenShift Merge Robot2018-02-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. etcd_scaleup: use inventory_hostname when etcd ca host is being picked This would fix etcd scaleup playbook when inventory uses custom hostnames, e.g.: ``` new_etcd: hosts: new-etcd-node: ansible_host: ec2-54-173-186-97.compute-1.amazonaws.com ```
| * | | | | | | | | | etcd_scaleup: use inventory_hostname when etcd ca host is being pickedVadim Rutkovsky2018-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | | | | | | | Merge pull request #7113 from mgugino-upstream-stage/fix-etcd-scaleup-sanityMichael Gugino2018-02-122-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix etcd scaleup plays
| * | | | | | | | | | | Fix etcd scaleup playsMichael Gugino2018-02-122-1/+19
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that only the proper host groups have sanity checks run during etcd scaleup. This commit also adds additional debugging statements to sanity_checks.py to make it easier to debug when an error occurs. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1543771
* | | | | | | | | | | Merge pull request #7108 from spadgett/check-version-for-console-installOpenShift Merge Robot2018-02-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Disable console install when not 3.9 or newer Fixes https://github.com/openshift/origin/issues/18573 /assign @sdodson @smarterclayton @stevekuznetsov
| * | | | | | | | | | Disable console install when not 3.9 or newerSamuel Padgett2018-02-121-1/+3
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7103 from vrutkovs/origin-dns-prepend-cluster-localOpenShift Merge Robot2018-02-121-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. origin-dns: make sure cluster.local DNS server is listed first This would ensure glibc resolver won't discard this server when existing DNS server list is longer than 2. This sed would also update existing configuration, where cluster.local was appended Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1544001
| * | | | | | | | | origin-dns: make sure cluster.local DNS server is listed firstVadim Rutkovsky2018-02-121-2/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would ensure glibc resolver won't discard this server when existing DNS server list is longer than 2. This sed would also update existing configuration, where cluster.local was appended
* | | | | | | | | Merge pull request #7107 from csrwng/cluster_operator_componentsOpenShift Merge Robot2018-02-121-0/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add playbook to install components for cluster operator Adds a playbook to install infra components for cluster operator
| * | | | | | | | | Add playbook to install components for cluster operatorCesar Wong2018-02-121-0/+24
| | | | | | | | | |
* | | | | | | | | | Merge pull request #7083 from SaravanaStorageNetwork/fix_templatesOpenShift Merge Robot2018-02-129-20/+370
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Backport changes for glusterfs and heketi template Backport changes for glusterfs and heketi template To avoid unknown parameter errors like GB_GLFS_LRU_COUNT and HEKETI_FSTAB Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
| * | | | | | | | | | Backport changes for glusterfs, heketi, s3 and block templatesSaravanakumar Arumugam2018-02-129-20/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
* | | | | | | | | | | Merge pull request #6476 from jihoon5/jihoon5Michael Gugino2018-02-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | Support master node high availability
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 18:35:00 +0000