summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5911 from giuseppe/crio-open-port-10010Scott Dodson2017-10-274-0/+53
|\ | | | | cri-o: open port 10010
| * cri-o: open port 10010Giuseppe Scrivano2017-10-274-0/+53
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #5901 from ashcrow/failed-whenScott Dodson2017-10-271-1/+1
|\ \ | | | | | | crio: Add failed_when to overlay check
| * | crio: Add failed_when to overlay checkSteve Milner2017-10-261-1/+1
| | | | | | | | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506399 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | Merge pull request #5904 from mtnbikenc/fix-openshift_releaseRussell Teague2017-10-271-1/+1
|\ \ \ | | | | | | | | Correct openshift_release regular expression
| * | | Correct openshift_release regular expressionRussell Teague2017-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match only versions like: 3.7 3.7.0 3.7.0.0 Avoids matches like: 3.7.0.0.0.0
* | | | Merge pull request #5905 from ashcrow/restorcon-for-crioScott Dodson2017-10-271-0/+4
|\ \ \ \ | | | | | | | | | | crio: restorcon /var/lib/containers
| * | | | crio: restorcon /var/lib/containersSteve Milner2017-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the cri-o system container some items in /var/lib/containers end up having incorrect labels. This runs restorecon -R /var/lib/containers after the system container is installed.
* | | | | Merge pull request #5823 from mtnbikenc/fix-initialize_factsScott Dodson2017-10-271-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Force include_role to static for loading openshift_facts module
| * | | | | Force include_role to static for loading openshift_facts moduleRussell Teague2017-10-191-0/+1
| | | | | |
* | | | | | Merge pull request #5880 from giuseppe/fix-docker-crio-credentialsScott Dodson2017-10-271-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | docker: set credentials when using system container
| * | | | | | docker: set credentials when using system containerGiuseppe Scrivano2017-10-263-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Merge pull request #5742 from mtnbikenc/refactor-checksScott Dodson2017-10-277-34/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 1504593 Refactor health check playbooks
| * | | | | | | Refactor health check playbooksRussell Teague2017-10-127-34/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Standardize play/tasks naming - Move install checks to separate playbook with checkpointing - Correct 'docker_storage' tags
* | | | | | | | Merge pull request #5874 from mtnbikenc/fix-5675Scott Dodson2017-10-271-5/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Remove 'Not Started' status from playbook checkpoint
| * | | | | | | Remove 'Not Started' status from playbook checkpointRussell Teague2017-10-251-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playbook status should only be reported for phases that have completed or which have been started. Reporting 'Not Started' could be confusing when running playbooks that do not have an 'installer phase'. Fixes #5675
* | | | | | | | Merge pull request #5890 from staebler/svc-cat-rc0.1.0Scott Dodson2017-10-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix CA Bundle passed to service-catalog broker for ansible-service-broker
| * | | | | | | | Fix CA Bundle passed to service-catalog broker for ansible-service-brokerstaebler2017-10-251-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5760 from sdodson/oa-deps-masterScott Dodson2017-10-271-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make openshift-ansible depend on all subpackages
| * | | | | | | | | Make openshift-ansible depend on all subpackagesScott Dodson2017-10-131-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5910 from mtnbikenc/remove-origin-inventoryScott Dodson2017-10-271-900/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove inadvertently committed inventory file
| * | | | | | | | | | Remove inadvertently committed inventory fileRussell Teague2017-10-271-900/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5891 from mgugino-upstream-stage/dns-bind-interfacesMichael Gugino2017-10-272-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change dnsmasq to bind-interfaces + except-interfaces
| * | | | | | | | | | | Change dnsmasq to bind-interfaces + except-interfacesMichael Gugino2017-10-252-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we have to set the listen ip for dnsmasq via ansible during installation. This commit enables dnsmasq to bind-interfaces + exclude interfaces to ensure dnsmasq doesn't listen on lo interface.
* | | | | | | | | | | | Merge pull request #5875 from mgugino-upstream-stage/fix-upgrade-config-hookMichael Gugino2017-10-273-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This previously passed all CI tests, merge queue broke last night. Merging, this is a blocker bug.
| * | | | | | | | | | | Add master config upgrade hook to upgrade-all playsMichael Gugino2017-10-253-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, in 1.5, 3.6, 1.7 upgrade-all plays, control plane upgrades are not called correctly. This commit ensures the master config hook is appropriately applied during these upgrades to match the steps in control plane only upgrades. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1486054
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.183.0].Jenkins CD Merge Bot2017-10-272-2/+5
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.182.0].Jenkins CD Merge Bot2017-10-262-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | Merge pull request #5885 from kwoodson/fix_image_cleanScott Dodson2017-10-263-7/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Moving removal of unwanted artifacts to image_prep.
| * | | | | | | | | | | Moving removal of unwanted artifacts to image_prep.Kenny Woodson2017-10-253-7/+13
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #5900 from kwoodson/cert_key_path_fixScott Dodson2017-10-262-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Documentation fix for openshift_aws_iam_cert_key_path
| * | | | | | | | | | | Fixing documentation for the cert_key_path variable name.Kenny Woodson2017-10-262-3/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5882 from mgugino-upstream-stage/persistent-journald-logsScott Dodson2017-10-261-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure journald persistence directories exist
| * | | | | | | | | | | Ensure journald persistence directories existMichael Gugino2017-10-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we configure openshfit masters to modify journald to use persistent storage. The directory structure must be created manually according to documentation. This commit ensures the needed directory is created. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506141
* | | | | | | | | | | | Merge pull request #5793 from tbielawa/openshift_management_moduleOpenShift Merge Robot2017-10-2620-106/+493
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Openshift MGMT Fixes and Container Provider Integration Various small fixes/polishing to the openshift management role. * Updated uninstall script * Automatically add cluster to new management deployment * Scaffolding for scripts to add *N* number of OCP/Origin clusters as Container Providers in any arbitrary MIQ/CFME instance * Fix mis-named task in `openshift_nfs/create_export` * Uninstall playbook only runs on one master
| * | | | | | | | | | | Fix lintTim Bielawa2017-10-202-12/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Move add_many_container_providers.yml to playbooks/byo/openshift-management ↵Andrew Butcher2017-10-204-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a noop task include to load filter plugins.
| * | | | | | | | | | | Refactor adding multiple container providersTim Bielawa2017-10-206-53/+94
| | | | | | | | | | | |
| * | | | | | | | | | | Management Cleanup and Provider IntegrationTim Bielawa2017-10-2015-75/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add container provider integration * General cleanup * Poll until service fully starts * Add notes on multiple-provider additions
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.181.0].Jenkins CD Merge Bot2017-10-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | Merge pull request #5856 from sngchlko/fix-typo-in-kuryrMichael Gugino2017-10-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo and add detailed comments in kuryr
| * | | | | | | | | | | | Fix typo and add detailed comments in kuryrSeungcheol Ko2017-10-241-3/+3
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5863 from mgugino-upstream-stage/fix-logging-loop-warningsOpenShift Merge Robot2017-10-261-12/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix loop_var warnings during logging install Currently, install_logging.yml in openshift_logging role loops over other roles. This creates a collision with the keyword 'item' in those roles. This commit adds the loop_var as suggested by ansible warnings.
| * | | | | | | | | | | | Fix loop_var warnings during logging installMichael Gugino2017-10-241-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, install_logging.yml in openshift_logging role loops over other roles. This creates a collision with the keyword 'item' in those roles. This commit adds the loop_var as suggested by ansible warnings.
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.179.0].Jenkins CD Merge Bot2017-10-262-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | | | Merge pull request #5655 from giuseppe/etcd-additional-bind-mountOpenShift Merge Robot2017-10-259-76/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. etcd: remove hacks for the system container This removes the special handling of the etcd directories when running as a system container. Marked as WIP as it depends from this [change](https://bugzilla.redhat.com/show_bug.cgi?id=1484326) in the etcd image to be reflected into `registry.access.redhat.com/rhel7/etcd`
| * | | | | | | | | | | | | etcd: remove hacks for the system containerGiuseppe Scrivano2017-10-239-76/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ADDTL_MOUNTS to add a bind mount to the etcd configuration. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | | | | Merge pull request #5830 from abutcher/registry-deploymentOpenShift Merge Robot2017-10-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure deployment_subtype is set within openshift_sanitize_inventory. https://bugzilla.redhat.com/show_bug.cgi?id=1504021
| * | | | | | | | | | | | | Ensure deployment_subtype is set within openshift_sanitize_inventory.Andrew Butcher2017-10-202-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5861 from mtnbikenc/fix-1505537Scott Dodson2017-10-251-27/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1505537 Remove pause from master service startup