summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Limit hosts that run openshift_version roleMichael Gugino2017-10-031-2/+2
| | | | | | | | | | | | | Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
* Automatic commit of package [openshift-ansible] release [3.7.0-0.141.0].Jenkins CD Merge Bot2017-10-032-2/+7
| | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* Merge pull request #5629 from mgugino-upstream-stage/duplicate-docker-regsOpenShift Merge Robot2017-10-031-2/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Restore registires to /etc/sysconfig/docker Previously, a commit was added to migrate registires from /etc/sysconfig/docker to /etc/containers/registries.conf We are not currently enforcing a minimum version of docker to consume from this new file, thus some installations are not utilizing the correct repositories. This commit duplicates the registires in both locations to ensure additional/blocked/insecure registries are honored.
| * Restore registires to /etc/sysconfig/dockerMichael Gugino2017-10-021-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, a commit was added to migrate registires from /etc/sysconfig/docker to /etc/containers/registries.conf We are not currently enforcing a minimum version of docker to consume from this new file, thus some installations are not utilizing the correct repositories. This commit duplicates the registires in both locations to ensure additional/blocked/insecure registries are honored.
* | Merge pull request #5611 from smarterclayton/update_varsOpenShift Merge Robot2017-10-034-149/+209
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update to the openshift_aws style scheme for variables Corresponding changes will be made to the other repositories after merge. @kwoodson Manually tested this with openshift/origin-gce#51
| * | Update to the openshift_aws style scheme for variablesClayton Coleman2017-10-014-149/+209
| | | | | | | | | | | | | | | Corresponding changes will be made to the other repositories after merge.
* | | Merge pull request #5614 from mtnbikenc/fix-prometheusOpenShift Merge Robot2017-10-033-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix Prometheus byo entry point Adds the std_include.yml playbook to the byo entrypoint and moves the conditional install to the openshift_hosted.yml portion of an install.
| * | | Fix Prometheus byo entry pointRussell Teague2017-10-023-1/+3
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.140.0].Jenkins CD Merge Bot2017-10-032-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #5619 from ashcrow/1497274OpenShift Merge Robot2017-10-021-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. openshift_checks: Fix incorrect list cast ``docker_image_availability`` casted ``openshift_docker_additional_registries`` to a list using the ``list()`` function. If a string was returned (IE: only a single registry added) the result would be the string split up by component characters. This change forces a string result from ``get_var`` to be placed inside a list. If the result is anything BUT a string the original ``list()`` function is called on the result. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497274 Resolves #5610
| * | | | openshift_checks: Fix incorrect list castSteve Milner2017-10-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docker_image_availability casted openshift_docker_additional_registries to a list using the list() function. If a string was returned (IE: only a single registry added) the result would be the string split up by component characters. This change forces a string result from get_var to be placed inside a list. If the result is anything BUT a string the original list() function is called on the result. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497274 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | Merge pull request #5608 from jarrpa/empty-optionOpenShift Merge Robot2017-10-0230-30/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. lib/base: Allow for empty option value Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1483923 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | lib/base: Allow for empty option valueJose A. Rivera2017-09-2930-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.139.0].Jenkins CD Merge Bot2017-10-022-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5600 from ewolinetz/bz1496352OpenShift Merge Robot2017-10-024-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Reverting using uninstall variables for logging and metrics Reverting using `uninstall` variables for logging and metrics. Addresses bug and comments in https://bugzilla.redhat.com/show_bug.cgi?id=1496352
| * | | | | | Reverting using uninstall variables for logging and metricsEric Wolinetz2017-09-294-4/+2
| | | | | | |
* | | | | | | Merge pull request #5562 from ttindell2/masterOpenShift Merge Robot2017-10-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix Heketi Deployment without external registry access #5550 Updated task to use the --image flag. The Image will now be set to: {{ glusterfs_heketi_image}}:{{ glusterfs_heketi_version }} This means that the user can specify an internal registry if needed. Created ticket with heketi: heketi/heketi#870
| * | | | | | | Add --image flag to setup-openshift-heketi-storageTim Tindell2017-09-271-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5622 from simo5/yammlintScott Dodson2017-10-021-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Fix mispelling in error message yammlint -> yamllint
| * | | | | | | Fix mispelling in error message yammlint -> yamllintSimo Sorce2017-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simo Sorce <simo@redhat.com>
* | | | | | | | Merge pull request #5510 from abutcher/separate-certsOpenShift Merge Robot2017-10-0234-186/+232
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Break out certificate playbooks Break out certificate role dependencies and move them into their own playbooks.
| * | | | | | | | Separate certificate playbooks.Andrew Butcher2017-10-0234-186/+232
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.138.0].Jenkins CD Merge Bot2017-10-022-2/+8
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5609 from jarrpa/heketi-account-permsOpenShift Merge Robot2017-10-022-10/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: make ServiceAccounts privileged when either glusterfs or heketi is native Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1486187 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | GlusterFS: make ServiceAccounts privileged when either glusterfs or heketi ↵Jose A. Rivera2017-09-292-10/+11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | is native Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #5618 from vshn/defstorageclasstyp1Scott Dodson2017-10-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in openshift_default_storage_class/README
| * | | | | | Fix typo in openshift_default_storage_class/READMEMichael Hanselmann2017-10-021-1/+1
|/ / / / / /
* | | | | | Merge pull request #5589 from mgugino-upstream-stage/provision-var-fixes-masterJan Chaloupka2017-10-024-9/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix some provisioning variables
| * | | | | Fix some provisioning variablesMichael Gugino2017-09-294-9/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes some provisioning variables. It also adjusts a failure condition for an ec2 call, which may fail silently without having the necessary permissions, which creates an unrelated error message later in the run.
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.137.0].Jenkins CD Merge Bot2017-10-022-2/+7
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #5599 from ashcrow/node-start-fixOpenShift Merge Robot2017-10-011-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. openshift_node: Set DOCKER_SERVICE for system container The node system container was being installed with the ```DOCKER_SERVICE``` holding to it's ```manifest.json``` default of docker.service. This chage adds the ```DOCKER_SERVICE``` parameter on node system container install so that it uses the same value from the installer stored in ```openshift.docker.service_name```. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496707
| * | | | openshift_node: Add MASTER_SERVICE on system container installSteve Milner2017-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the MASTER_SERVICE to openshift.common.service_type. Signed-off-by: Steve Milner <smilner@redhat.com>
| * | | | openshift_node: Set DOCKER_SERVICE for system containerSteve Milner2017-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The node system container was being installed with the DOCKER_SERVICE holding to it's manifest.json default of docker.service. This change adds the DOCKER_SERVICE parameter on node system container install so that it uses the same value from the installer stored in openshift.docker.service_name. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496707 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.136.0].Jenkins CD Merge Bot2017-10-012-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5449 from abutcher/wildcard-router-cert-redeployOpenShift Merge Robot2017-09-3016-215/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1490186: Router pod not running after router certificates redeployment This carries https://github.com/openshift/openshift-ansible/pull/5417. More of the router cert redeploy logic could be moved into the `openshift_hosted` role with a flag. I may pull those over. https://bugzilla.redhat.com/show_bug.cgi?id=1490186
| * | | | | Include openshift_hosted when redeploying router certificates to handle ↵Andrew Butcher2017-09-292-74/+46
| | | | | | | | | | | | | | | | | | | | | | | | auto-generated wildcard certificate or custom openshift_hosted_router_certificate.
| * | | | | Check for router service annotations when redeploying router certificates.Andrew Butcher2017-09-291-3/+29
| | | | | |
| * | | | | Remove oo_option symlink from specfile.Andrew Butcher2017-09-291-4/+0
| | | | | |
| * | | | | Add a README.md to lookup_plugins/Andrew Butcher2017-09-291-0/+1
| | | | | |
| * | | | | Remove oo_option facts.Andrew Butcher2017-09-2912-138/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #5593 from ingvagabund/block-upgrade-if-etcd3-not-setJan Chaloupka2017-09-301-0/+4
|\ \ \ \ \ | | | | | | | | | | | | block 3.6->3.7 upgrade if storage backend is not set to etcd3
| * | | | | block 3.6->3.7 upgrade if storage backend is not set to etcd3Jan Chaloupka2017-09-291-0/+4
| |/ / / /
* | | | | Merge pull request #5565 from mgugino-upstream-stage/provisioning-centos-supportOpenShift Merge Robot2017-09-2912-101/+166
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Changes necessary to support AMI building Currently, AMI building does not work. These changes implement the necessary steps to build an AMI for usage as a 'golden node image'.
| * | | | | Changes necessary to support AMI buildingMichael Gugino2017-09-2812-101/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, AMI building does not work. These changes implement the necessary steps to build an AMI for usage as a 'golden node image'.
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.135.0].Jenkins CD Merge Bot2017-09-302-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5595 from mgugino-upstream-stage/reg-auth-variable-fixOpenShift Merge Robot2017-09-292-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix registry auth variable There is currently a bug in registry auth credential creation logic for openshift_node and openshift_node_upgrade This commit fixes the logic.
| * | | | | | Fix registry auth variableMichael Gugino2017-09-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently a bug in registry auth credential creation logic for openshift_node and openshift_node_upgrade This commit fixes the logic.
* | | | | | | Merge pull request #5601 from detiber/openshift_repos_fixOpenShift Merge Robot2017-09-294-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. fix whitespace for centos repos This addresses an issue where repo files were missing a newline between the enabled and gpgkey entries. Current repo file content: ``` [centos-openshift-origin] name=CentOS OpenShift Origin baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS [centos-openshift-origin-testing] name=CentOS OpenShift Origin Testing baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=0gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-debuginfo] name=CentOS OpenShift Origin DebugInfo baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-source] name=CentOS OpenShift Origin Source baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS ``` Expected content: ``` [centos-openshift-origin] name=CentOS OpenShift Origin baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS [centos-openshift-origin-testing] name=CentOS OpenShift Origin Testing baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=0 gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-debuginfo] name=CentOS OpenShift Origin DebugInfo baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-source] name=CentOS OpenShift Origin Source baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS ```
| * | | | | | fix whitespace for centos reposJason DeTiberus2017-09-294-4/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5575 from ewolinetz/bz1470623Scott Dodson2017-09-294-2/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | Registering the broker for TSB
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 21:09:07 +0000