summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make os_firewall_manage_iptables run on python3Michael Scherer2016-11-221-1/+2
| | | | | | | | | | | | | | | | It fail with that traceback: Traceback (most recent call last): File \"/tmp/ansible_ib5gpbsp/ansible_module_os_firewall_manage_iptables.py\", line 273, in <module> main() File \"/tmp/ansible_ib5gpbsp/ansible_module_os_firewall_manage_iptables.py\", line 257, in main iptables_manager.add_rule(port, protocol) File \"/tmp/ansible_ib5gpbsp/ansible_module_os_firewall_manage_iptables.py\", line 87, in add_rule self.verify_chain() File \"/tmp/ansible_ib5gpbsp/ansible_module_os_firewall_manage_iptables.py\", line 82, in verify_chain self.create_jump() File \"/tmp/ansible_ib5gpbsp/ansible_module_os_firewall_manage_iptables.py\", line 142, in create_jump input_rules = [s.split() for s in output.split('\\n')]
* Merge pull request #2818 from mtnbikenc/package-refactorScott Dodson2016-11-2138-77/+84
|\ | | | | Refactor to use Ansible package module
| * Refactor to use Ansible package moduleRussell Teague2016-11-1738-77/+84
| | | | | | | | | | The Ansible package module will call the correct package manager for the underlying OS.
* | Merge pull request #2833 from dustymabe/dusty-tunedJason DeTiberus2016-11-211-1/+7
|\ \ | | | | | | Only run tuned-adm if tuned exists.
| * | Only run tuned-adm if tuned exists.Dusty Mabe2016-11-211-1/+7
| | | | | | | | | | | | | | | | | | Fedora Atomic Host does not have tuned installed. Fixes #2809
* | | Merge pull request #2827 from abutcher/BZ1377619Jason DeTiberus2016-11-213-41/+51
|\ \ \ | |/ / |/| | Allow ansible to continue when a node is unaccessible or fails.
| * | Delegate openshift_manage_node tasks to master host.Andrew Butcher2016-11-212-41/+46
| | |
| * | Allow ansible to continue when a node is unaccessible or fails.Andrew Butcher2016-11-182-1/+6
| | |
* | | Merge pull request #2820 from dgoodwin/yum-check-skip-atomicScott Dodson2016-11-181-1/+2
|\ \ \ | | | | | | | | Fix yum/subman version check on Atomic.
| * | | Fix yum/subman version check on Atomic.Devan Goodwin2016-11-171-1/+2
| | | |
* | | | Merge pull request #2822 from sdodson/onlydnsmasqScott Dodson2016-11-181-5/+10
|\ \ \ \ | | | | | | | | | | node_dnsmasq -- Set dnsmasq as our only nameserver
| * | | | Create the file in two passes, atomicly copy it overScott Dodson2016-11-181-6/+8
| | | | |
| * | | | node_dnsmasq -- Set dnsmasq as our only nameserverScott Dodson2016-11-171-1/+4
| | | | |
* | | | | Merge pull request #2825 from jsuchenia/gce-escape-lognameJason DeTiberus2016-11-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Escape LOGNAME variable according to GCE rules #2736
| * | | | Escape LOGNAME variable according to GCE rulesJacek Suchenia2016-11-181-1/+1
|/ / / /
* | | | Merge pull request #379 from cgwalters/storage-nfs-lvmScott Dodson2016-11-171-1/+1
|\ \ \ \ | |_|_|/ |/| | | storage/nfs_lvm: Also export as ReadWriteOnce
| * | | storage/nfs_lvm: Also export as ReadWriteOnceColin Walters2015-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While NFS supports `ReadWriteMany`, it's very common for pod authors to only need `ReadWriteOnce`. At the moment, kube will not auto-bind a `RWO` claim to a `RWM` volume.
* | | | Merge pull request #2821 from sdodson/disable-origin-repoScott Dodson2016-11-172-0/+6
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | Allow users to disable the origin repo creation
| * | Allow users to disable the origin repo creationScott Dodson2016-11-172-0/+6
|/ /
* | Merge pull request #2819 from vishpat/ip-forwardingScott Dodson2016-11-164-5/+31
|\ \ | | | | | | Added ip forwarding for nuage
| * | Added ip forwarding for nuageVishal Patil2016-11-154-5/+31
| | |
* | | Merge pull request #2702 from jkhelil/fix_master_config_templateAndrew Butcher2016-11-162-16/+18
|\ \ \ | | | | | | | | Prevent useless master restart by reworking template for master service enf file
| * | | Prevent useless master by reworking template for master service enf fileJawed khelil2016-11-022-16/+18
| | | |
* | | | Merge pull request #2734 from dougbtv/openstack_timeout_optionJason DeTiberus2016-11-163-1/+4
|\ \ \ \ | | | | | | | | | | [openstack] allows timeout option for heat create stack
| * | | | [openstack] allows timeout option for heat create stackdougbtv2016-11-053-1/+4
| | | | |
* | | | | Merge pull request #2606 from abutcher/nuage-haproxy-portTim Bielawa2016-11-161-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Add nuage rest server port to haproxy firewall rules.
| * | | | | Add nuage rest server port to haproxy firewall rules.Andrew Butcher2016-10-141-0/+5
| | | | | |
* | | | | | Merge pull request #2636 from enlinxu/masterAndrew Butcher2016-11-163-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support 3rd party scheduler
| * | | | | | support 3rd party schedulerenlinxu2016-10-203-0/+7
| | | | | | |
* | | | | | | Merge pull request #2803 from tbielawa/BZ1390849Scott Dodson2016-11-162-5/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix metrics deployment in 3.4
| * | | | | | | Add view permissions to hawkular saScott Dodson2016-11-151-0/+18
| | | | | | | |
| * | | | | | | Use multiple '-v's when creating the metrics deployer commandTim Bielawa2016-11-152-5/+10
| | | | | | | |
* | | | | | | | Merge pull request #2815 from dgoodwin/yumCheckScott Dodson2016-11-161-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check for bad versions of yum and subscription-manager.
| * | | | | | | | Check for bad versions of yum and subscription-manager.Devan Goodwin2016-11-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of yum and repoquery will output the given additional warning when using newer versions of subscription-manager, with older versions of yum. (RHEL 7.1) Installing/upgrading newer docker can pull this subscription-manager in resulting in problems with older versions of ansible and it's yum module, as well as any use of repoquery/yum commands in our playbooks. This change explicitly checks for the problem by using repoquery and fails early if found. This is run early in both config and upgrade.
* | | | | | | | | Merge pull request #2816 from mtnbikenc/docs-fixScott Dodson2016-11-161-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [Docs] Best Practices Guide - Corrected syntax and typos
| * | | | | | | | | Corrected syntax and typosRussell Teague2016-11-161-6/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2763 from yfauser/byo_cni_plugin_fixesAndrew Butcher2016-11-163-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [#2698] Change to allow cni deployments without openshift SDN
| * | | | | | | | | Change to allow cni deployments without openshift SDNyfauser2016-11-083-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The roles/openshift_facts main task did not pass the cni plugin variable to the later role playbooks. The master.yaml and node.yaml templates did not allow for a cni configuration without either installing openshift sdn or nuage. This change will allow to use os_sdn_network_plugin_name=cni and set openshift_use_openshift_sdn=false for deployments that use a cni plugin that doesn't need and want openshift sdn to be installed
* | | | | | | | | | Merge pull request #2813 from lhuard1A/optimize_listJason DeTiberus2016-11-165-44/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Optimize the cloud-specific list.yml playbooks
| * | | | | | | | | | Optimize the cloud-specific list.yml playbooksLénaïc Huard2016-11-165-44/+11
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by removing the need to gather facts on all VMs in order to list them. And prettify the output of AWS list the same way it is done for other cloud providers.
* | | | | | | | | | Merge pull request #2814 from lhuard1A/fix_gce_subnetJason DeTiberus2016-11-162-543/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Fix GCE cluster creation
| * | | | | | | | | Fix GCE cluster creationLénaïc Huard2016-11-162-543/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to create a GCE cluster when the `gce.ini` configuration file contains a non-default network leads to the following error: ``` TASK [Launch instance(s)] ****************************************************** fatal: [localhost]: FAILED! => {"changed": false, "failed": true, "msg": "Unexpected error attempting to create instance lenaic2-master-74f10, error: {'domain': 'global', 'message': \"Invalid value for field 'resource.networkInterfaces[0]': ''. Subnetwork should be specified for custom subnetmode network\", 'reason': 'invalid'}"} ``` The `subnetwork` parameter needs to be added and taken into account.
* | | | | | | | | Merge pull request #2810 from sdodson/BZ1390913Scott Dodson2016-11-151-5/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add rolebinding-reader
| * | | | | | | | | Fix typoScott Dodson2016-11-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix a few places where we're not specifying the admin kubeconfigScott Dodson2016-11-151-6/+12
| | | | | | | | | |
| * | | | | | | | | Add rolebinding-readerScott Dodson2016-11-151-0/+7
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug 1390913 Fixes BZ1390913
* | | | | | | | | Merge pull request #2677 from ↵Scott Dodson2016-11-141-11/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | EricMountain-1A/fix_docker_fatal_selinux_4upstream-github Docker daemon is started prematurely.
| * | | | | | | | Docker daemon is started prematurely.Eric Mountain2016-11-141-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker service is started prior to configuration changes being applied. The service is then not restarted by the handlers, so configuration changes are not applied. We now start the docker service only once all config changes have been made.
* | | | | | | | | Merge pull request #2802 from sdodson/image-stream-syncScott Dodson2016-11-144-3/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Sync latest image stream and templates
| * | | | | | | | Sync logging deployer changes from origin to enterpriseScott Dodson2016-11-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in https://github.com/openshift/origin-aggregated-logging/commit/d40fd9b83a6f6c0fb962db8869e6a35ef4f72751 https://github.com/openshift/origin-aggregated-logging/commit/f55cf03231d3ff2c7c9f2b9c8a4e1c29b4535c9c