summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6841 from sdodson/bz1491100OpenShift Merge Robot2018-01-251-0/+2
|\ | | | | | | | | | | | | Automatic merge from submit-queue. Set a default for openshift_hosted_registry_storage_azure_blob_realm Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1491100
| * Set a default for openshift_hosted_registry_storage_azure_blob_realmScott Dodson2018-01-231-0/+2
| |
* | Merge pull request #6849 from vrutkovs/label-masters-with-upstream-standardOpenShift Merge Robot2018-01-255-42/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Label masters with node-role.kubernetes.io/master This is controlled by `openshift_master_node_label` var in openshift_manage_node Related to https://bugzilla.redhat.com/show_bug.cgi?id=1535673
| * | openshift_manage_node: Label nodes in one passVadim Rutkovsky2018-01-241-14/+6
| | |
| * | Label masters with node-role.kubernetes.io/master. This PR also sets these ↵Vadim Rutkovsky2018-01-245-42/+49
| | | | | | | | | | | | | | | | | | | | | | | | labels and scheduling status during upgrades Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | Merge pull request #6626 from pgier/prometheus-remove-tsdb-block-configOpenShift Merge Robot2018-01-242-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. openshift_prometheus: remove block duration settings The prometheus block duration settings should not be changed from their defaults. See also: https://github.com/prometheus/prometheus/pull/3618
| * | | openshift_prometheus: remove block duration settingsPaul Gier2018-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | The prometheus block duration settings should not be changed from their defaults. See also: https://github.com/prometheus/prometheus/pull/3618
* | | | Merge pull request #6848 from mgugino-upstream-stage/remove-fact-labelsOpenShift Merge Robot2018-01-241-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unused node.lables from openshift_facts
| * | | | Remove unused node.lables from openshift_factsMichael Gugino2018-01-241-3/+0
| | | | | | | | | | | | | | | | | | | | Removing dead code.
* | | | | Merge pull request #6551 from mgugino-upstream-stage/swapoffScott Dodson2018-01-244-62/+148
|\ \ \ \ \ | | | | | | | | | | | | Create swapoff module
| * | | | | Create swapoff moduleMichael Gugino2018-01-244-62/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create custome ansible module 'swapoff' to idempotently disable swap in /etc/fstab and also run swapoff.
* | | | | | Merge pull request #6843 from rajatchopra/bugdnsmasqScott Dodson2018-01-242-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change dnsmasq Requires to Wants
| * | | | | | Change dnsmasq Requires to Wants. ↵Rajat Chopra2018-01-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1532960 Signed-off-by: Rajat Chopra <rchopra@redhat.com>
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.24.0].Jenkins CD Merge Bot2018-01-242-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6842 from ↵Scott Dodson2018-01-249-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/protect-upgrade-master-version Protect master installed version during node upgrades
| * | | | | | | Protect master installed version during node upgradesMichael Gugino2018-01-239-1/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master version is unprotected during all upgrades. During node-only upgrades, master version should remain protected to ensure correct image tag is set for node upgrades. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
* | | | | | | Merge pull request #6819 from fabianvf/1524805-service-catalog-pull-policyOpenShift Merge Robot2018-01-242-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1524805- ServiceCatalog now works disconnected Change imagePullPolicy for service catalog from Always to IfNotPresent, allowing service catalog to install in a disconnected setting https://bugzilla.redhat.com/show_bug.cgi?id=1524805
| * | | | | | | Bug 1524805- ServiceCatalog now works disconnectedFabian von Feilitzsch2018-01-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change imagePullPolicy for service catalog from Always to IfNotPresent, allowing service catalog to install in a disconnected setting
* | | | | | | | Merge pull request #6825 from vrutkovs/nfs-storage-quotesOpenShift Merge Robot2018-01-241-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. NFS Storage: make sure openshift_hosted_*_storage_nfs_directory are quoted This enables using non-standard symbols (e.g. spaces) in the path Fixes #6824
| * | | | | | | | NFS Storage: make sure openshift_hosted_*_storage_nfs_directory are quotedVadim Rutkovsky2018-01-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables using non-standard symbols (e.g. spaces) in the path Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | | | | | Merge pull request #6830 from bparees/registry_addrOpenShift Merge Robot2018-01-241-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname
| * | | | | | | | use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the ↵Ben Parees2018-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registry hostname bug 1537593 https://bugzilla.redhat.com/show_bug.cgi?id=1537593
* | | | | | | | | Merge pull request #6603 from joelddiaz/fetch_subnet_azOpenShift Merge Robot2018-01-243-3/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. un-hardcode default subnet az allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to be defined/overridded when using non-default (us-east-1) regions
| * | | | | | | | | un-hardcode default subnet azJoel Diaz2018-01-223-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to have to be defined/overridded (openshift_aws_subnet_az) when using non-default (us-east-1) regions update provisioning_vars.yml.example to show an example VPC structure
* | | | | | | | | | Merge pull request #6786 from simaishi/cf_46_betaOpenShift Merge Robot2018-01-2424-931/+4727
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. CF 4.6 Beta templates for OpenShift v3.7 and v3.9 cc @sdodson @Loicavenel
| * | | | | | | | | | Update CF 4.6 Beta templates in openshift_management directorySatoe Imaishi2018-01-244-29/+415
| | | | | | | | | | |
| * | | | | | | | | | Add templates to v3.9Satoe Imaishi2018-01-1910-451/+2156
| | | | | | | | | | |
| * | | | | | | | | | Use Beta repo pathSatoe Imaishi2018-01-184-13/+13
| | | | | | | | | | |
| * | | | | | | | | | CF 4.6 templatesSatoe Imaishi2018-01-1810-451/+2156
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6839 from mtnbikenc/fix-1506866OpenShift Merge Robot2018-01-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1506866] Update haproxy.cfg.j2 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506866
| * | | | | | | | | | | [1506866] Update haproxy.cfg.j2Russell Teague2018-01-231-1/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6767 from mazzystr/fix-master-internal-elbKenny Woodson2018-01-242-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to master-internal elb scheme
| * | | | | | | | | | | | Fix to master-internal elb schemeChris Callegari2018-01-172-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6815 from vrutkovs/failed_when-rc-to-intOpenShift Merge Robot2018-01-242-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. failed_when lists are implicitely ANDs, not ORs For some reason I believed `failed_when` lists are considered to be ORs, but it turns out these are ANDs. Fixes bug 1534538 Relates to #6751
| * | | | | | | | | | | | | failed_when lists are implicitely ANDs, not ORsVadim Rutkovsky2018-01-222-15/+5
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/ansible/ansible/issues/18311#issuecomment-258048690
* | | | | | | | | | | | | Merge pull request #6749 from sdodson/allow-5-etcd-masterScott Dodson2018-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Allow 5 etcd hosts
| * | | | | | | | | | | | Allow 5 etcd hostsScott Dodson2018-01-161-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6718 from sdodson/bz1533658Scott Dodson2018-01-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused symlink
| * | | | | | | | | | | | | Remove unused symlinkScott Dodson2018-01-131-1/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6846 from vrutkovs/installer-unwrap-helpScott Dodson2018-01-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installer: increase content width for commands, which may output URLs
| * | | | | | | | | | | | | | installer: increase content width for commands, which may output URLsVadim Rutkovsky2018-01-241-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6836 from spadgett/rollout-only-if-changedOpenShift Merge Robot2018-01-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Only rollout console if config changed /assign @sdodson @jwforres FYI
| * | | | | | | | | | | | | | Only rollout console if config changedSamuel Padgett2018-01-231-1/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6541 from smarterclayton/move_gcp_inScott Dodson2018-01-2455-115/+1550
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Allow openshift-ansible image to deploy to GCP
| * | | | | | | | | | | | | | Split control plane and component install in deploy_clusterClayton Coleman2018-01-237-88/+90
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | PyYAML is required by openshift_facts on nodesClayton Coleman2018-01-231-0/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move origin-gce roles and playbooks into openshift-ansibleClayton Coleman2018-01-2349-30/+1461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all core functionality into the openshift-ansible repo, adds the necessary equivalent entrypoint to the openshift-ansible installer image, and ensures the dynamic inventory mechanisms in openshift-ansible continue to work. Notable changes from origin-gce: * playbook extensions changed to .yml * dynamic inventory subdirectory created to prevent accidental use * use the custom entrypoint entrypoint-gcp for this image * move tasks into openshift_gcp role
| * | | | | | | | | | | | | | Directly select the ansible versionClayton Coleman2018-01-231-1/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add libcloud (required for dynamic GCE lookup) and which (relied on by gcloud).
* | | | | | | | | | | | | | Merge pull request #6835 from mtnbikenc/fix-1537105OpenShift Merge Robot2018-01-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1537105] Add openshift_facts to flannel role Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537105
| * | | | | | | | | | | | | | [1537105] Add openshift_facts to flannel roleRussell Teague2018-01-231-0/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:46:18 +0000