summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix master-facts for provisioningMichael Gugino2017-10-022-4/+4
|
* Make provisioning steps more reusableMichael Gugino2017-10-0215-137/+187
| | | | | Reorganizing and making some of the plays more reusable.
* 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
| * | | | | Registering the broker for TSBEric Wolinetz2017-09-284-2/+63
| | | | | |
* | | | | | 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.
* | | | | Merge pull request #5594 from ↵Jan Chaloupka2017-09-295-28/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | ingvagabund/move-health-checks-and-ctrl-plane-ver-before-excluders move health-checks and control-plane-verification before excluders
| * | | | move health-checks and control-plane-verification before excludersJan Chaloupka2017-09-295-28/+28
|/ / / /
* | | | Merge pull request #5588 from IshentRas/fix-typoScott Dodson2017-09-292-2/+2
|\ \ \ \ | | | | | | | | | | Fix typo in files (Docker registries)
| * | | | Fix typo in files (Docker registries)William Burton2017-09-292-2/+2
|/ / / /
* | | | Merge pull request #5020 from jsanda/prometheus-endpoint-configOpenShift Merge Robot2017-09-293-0/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Prometheus endpoint config for hawkular-metrics and cassandra Prometheus endpoints are exposed in hawkular-metrics and in cassandra by default. This PR adds options to disable them.
| * | | rename vars to avoid double negatives and ensuing confusionJohn Sanda2017-08-143-6/+6
| | | |
| * | | set prometheus endpoint properties to false by defaultJohn Sanda2017-08-091-2/+2
| | | |
| * | | add options to disable prometheus endpointsJohn Sanda2017-07-243-0/+7
| | | | | | | | | | | | | | | | | | | | The prometheus endpoints for cassandra and for hawkular-metrics are enabled by default. This commit adds the option to disable them.
| * | | Enable JMX reporting of internal metricsJohn Sanda2017-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | We need to enable jmx reporting of our internal, dropwizard metrics so that they can be exposed over prometheus endpoint.
* | | | Merge pull request #5544 from sdodson/aep-b-goneOpenShift Merge Robot2017-09-286-77/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove some remnants of Atomic Enterprise Removes a few un-necessary uninstall steps
| * | | | Remove some reminants of Atomic EnterpriseScott Dodson2017-09-266-77/+8
| | | | |
* | | | | Merge pull request #5559 from mgugino-upstream-stage/readd-ent-registryOpenShift Merge Robot2017-09-289-57/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Migrate enterprise registry logic to docker role Currently, the enterprise registry to forcefully added in openshift_facts. Recently, the docker role has been modified to consume registry variables directly, bypassing openshift_facts. This commit cleans up unused code in openshift_facts, and migrates enterprise registry logic to the docker role. Fixes: https://github.com/openshift/openshift-ansible/issues/5557
| * | | | Migrate enterprise registry logic to docker roleMichael Gugino2017-09-279-57/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the enterprise registry to forcefully added in openshift_facts. Recently, the docker role has been modified to consume registry variables directly, bypassing openshift_facts. This commit cleans up unused code in openshift_facts, and migrates enterprise registry logic to the docker role. Fixes: https://github.com/openshift/openshift-ansible/issues/5557
* | | | | Merge pull request #5531 from sqtran/remote-syslog-configsOpenShift Merge Robot2017-09-283-0/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Added new variables for logging role for remote-syslog plugin This commit adds a few new parameters useful for the fluent-plugin-remote-syslog work. These won't be useful until https://github.com/openshift/origin-aggregated-logging/pull/679 is merged into the logging project first.
| * | | | | minor update to README and removed dead filestran2017-09-272-215/+18
| | | | | |
| * | | | | Added new variables for logging role for remote-syslog pluginstran2017-09-274-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes the following code review fixes, and a rebase with upstream/master - mux.j2 template needed mux specific parameters for syslog configs - fixed bug in IF condition not checking for true-ness - updated README wording to remove ambiguity of payload_key's datatype
* | | | | | Merge pull request #5508 from sdodson/disable-image-streamsOpenShift Merge Robot2017-09-283-3/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow examples management to be disabled By setting openshift_install_examples=false the image stream and quick start templates will not be installed https://trello.com/c/zLaSgxig/436-2-customers-need-a-way-to-opt-out-of-openshift-ansible-template-and-imagestream-mangement Fixes #5061
| * | | | | Allow examples management to be disabledScott Dodson2017-09-223-3/+5
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 20:39:28 +0000