summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* openshift_checks: use oo group names everywhereLuke Meyer2017-10-0419-112/+116
|
* Merge pull request #5641 from mgugino-upstream-stage/fix-hosted-selectorsOpenShift Merge Robot2017-10-031-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix hosted selector variable migration Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
| * Fix hosted selector variable migrationMichael Gugino2017-10-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
* | Merge pull request #5606 from ↵OpenShift Merge Robot2017-10-032-5/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/provision-scale-elb-fixes-master Automatic merge from submit-queue. Fix provisiong scale group and elb logic Some changes necessary to support provisioning and scale group logic Some of this work is duplicated from an existing PR. That PR is about to merge, so I'll rebase once that hits.
| * | Fix provisiong scale group and elb logicMichael Gugino2017-09-294-11/+21
| | | | | | | | | | | | | | | Some changes necessary to support provisioning and scale group logic
* | | Merge pull request #5633 from mgugino-upstream-stage/fix-node-cloudproviderOpenShift Merge Robot2017-10-032-16/+16
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Move node aws credentials to config.yml Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
| * | Move node aws credentials to config.ymlMichael Gugino2017-10-022-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
* | | Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-oseOpenShift Merge Robot2017-10-033-9/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. CRI-O, Docker: set the tag to the OpenShift release on RHEL Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
| * | | docker: fix some tox warningsGiuseppe Scrivano2017-09-271-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | Require openshift_image_tag in the inventory with openshift-enterpriseGiuseppe Scrivano2017-09-271-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | crio: use the image_tag on RHELGiuseppe Scrivano2017-09-271-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | docker: use the image_tag on RHELGiuseppe Scrivano2017-09-271-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | 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 #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>
* | | | | | | | 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 #5510 from abutcher/separate-certsOpenShift Merge Robot2017-10-029-23/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-029-23/+16
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | 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>
* | | | | | | 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.
* | | | | | 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>
* | | | | | | Merge pull request #5449 from abutcher/wildcard-router-cert-redeployOpenShift Merge Robot2017-09-307-18/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auto-generated wildcard certificate or custom openshift_hosted_router_certificate.
| * | | | | | | Remove oo_option facts.Andrew Butcher2017-09-296-15/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5565 from mgugino-upstream-stage/provisioning-centos-supportOpenShift Merge Robot2017-09-292-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, AMI building does not work. These changes implement the necessary steps to build an AMI for usage as a 'golden node image'.
* | | | | | | | 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-293-2/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Registering the broker for TSB
| * | | | | | Registering the broker for TSBEric Wolinetz2017-09-283-2/+38
| | | | | | |
* | | | | | | Merge pull request #5577 from ashcrow/1496725OpenShift Merge Robot2017-09-291-1/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. openshift_facts: coerce docker_use_system_container to bool Use ``safe_get_bool()`` when reading ``docker_use_system_container`` to ensure that ansible accepted inputs are turned into real boolean results. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496725 3.6 Backport: https://github.com/openshift/openshift-ansible/pull/5578
| * | | | | | openshift_facts: coerce docker_use_system_container to boolSteve Milner2017-09-281-1/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use safe_get_bool() when reading docker_use_system_container to ensure that ansible accepted inputs are turned into real boolean results. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496725 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | Merge pull request #5581 from sqtran/formattingScott Dodson2017-09-291-22/+22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Quick formatting updates to the logging README
| * | | | | Quick formatting updates to the logging README.stran2017-09-281-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | This is just markup formatting changes, no content was updated.
* | | | | | Fix typo in files (Docker registries)William Burton2017-09-292-2/+2
| | | | | |