summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor fixliangxia2015-03-192-2/+2
|
* Merge pull request #116 from detiber/bugSquashingThomas Wiest2015-03-186-149/+336
|\ | | | | Bug squashing
| * Register node fixesJason DeTiberus2015-03-183-142/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set --hostname flag in node config in openshift_node role - Support some additional node attributes in openshift_node role - podCIDR - labels - annotations - Support both output types for openshift ex config view in openshift_register_node module - Support multiple api versions in openshift_register_node module - Support additional attributes in openshift_register_node module - annotations - labels - pod_cidr - external_ips (v1beta3, will be available after next kube rebase) - internal_ips (v1beta3, will be available after next kube rebase) - hostnames (v1beta3, will be available after next kube rebase) - external_id (v1beta3, will be available after next kube rebase)
| * Fix hostname handlingJason DeTiberus2015-03-183-7/+3
|/ | | | | - always set hostname if hostname does not match openshift_hostname - Use local IP instead of public IP as hostname for workaround
* Merge pull request #114 from twiest/prThomas Wiest2015-03-134-14/+18
|\ | | | | Renamed AnsibleUtil to AwsUtil. Fixed bug in AwsUtil for hosts without environment set.
| * made the bug fix more python-esqThomas Wiest2015-03-131-1/+1
| |
| * fixed bug in AwsUtil that was causing it to blow up on hosts without an ↵Thomas Wiest2015-03-131-0/+4
| | | | | | | | environment set.
| * renamed AnsibleUtil to AwsUtil because that's what it really is.Thomas Wiest2015-03-134-14/+14
|/
* Merge pull request #112 from detiber/masterWorkaroundThomas Wiest2015-03-131-0/+17
|\ | | | | Add workaround for openshift-master startup timeout
| * Add workaround for openshift-master startup timeoutJason DeTiberus2015-03-131-0/+17
| |
* | Merge pull request #113 from detiber/kubeFormatThomas Wiest2015-03-131-5/+11
|\ \ | |/ |/| Update openshift_register_node module for changes in .kubeconfig format ...
| * Update openshift_register_node module for changes in .kubeconfig format ↵Jason DeTiberus2015-03-131-5/+11
|/ | | | following latest kubernetes rebase
* Merge pull request #111 from twiest/opsshThomas Wiest2015-03-112-1/+179
|\ | | | | added opssh
| * added opsshThomas Wiest2015-03-112-1/+179
|/
* Merge pull request #70 from lhuard1A/fix_awsThomas Wiest2015-03-103-5/+11
|\ | | | | Fix AWS playbooks
| * Fix AWS playbooksLénaïc Huard2015-03-103-5/+11
| |
* | Merge pull request #110 from detiber/nodeResourcesThomas Wiest2015-03-093-2/+6
|\ \ | | | | | | Allow for overriding node resources
| * | Allow for overriding node resourcesJason DeTiberus2015-03-093-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add variable openshift_node_resources to openshift_node role - set default value for openshift_node_resources to { capacity: { cpu: ,memory: }} - If cpu is not set, then the default value will be chosen by the openshift_register_node module (num logical cpus) - If memory is not set, then the default value will be chosen by the openshift_register_node module (75% MemTotal according to /proc/meminfo)
* | | Merge pull request #109 from twiest/prThomas Wiest2015-03-094-5/+5
|\ \ \ | |/ / |/| | fixed github repo name in READMEs
| * | fixed github repo name in READMEsThomas Wiest2015-03-094-5/+5
|/ /
* | Merge pull request #66 from lhuard1A/explicit_python2Thomas Wiest2015-03-096-6/+6
|\ \ | | | | | | Explicitely use python2
| * | Explicitely use python2Lénaïc Huard2015-02-196-6/+6
| | | | | | | | | | | | | | | Some distributions are using python3 as the default python. On those ones, we need to explicitely use python2.
* | | Merge pull request #100 from detiber/randomCleanupThomas Wiest2015-03-0912-73/+118
|\ \ \ | | | | | | | | Random cleanup
| * | | Initial readmes for openshift_sdn_{master, node}Jason DeTiberus2015-03-062-26/+42
| | | |
| * | | Initial READMEs for openshift_{common, node, master}Jason DeTiberus2015-03-063-40/+69
| | | |
| * | | Fix license nameJason DeTiberus2015-03-067-7/+7
| | | |
* | | | Merge pull request #106 from detiber/condionalNodeOptionThomas Wiest2015-03-091-2/+3
|\ \ \ \ | | | | | | | | | | Conditionally set --nodes on master
| * | | | Conditionally set --nodes on masterJason DeTiberus2015-03-091-2/+3
| | |_|/ | |/| | | | | | | | | | | | | | - only add --nodes option to /etc/sysconfig/openshift-master when openshift_node_ips is not an empty list.
* | | | Merge pull request #105 from detiber/fixPermsKubeFolderThomas Wiest2015-03-092-2/+2
|\ \ \ \ | | | | | | | | | | Fix permissions on .kube folder
| * | | | Fix permissions on .kube folderJason DeTiberus2015-03-092-2/+2
| |/ / / | | | | | | | | | | | | - missing leading 0 on mode
* | | | Merge pull request #108 from detiber/fixFirewallThomas Wiest2015-03-092-32/+46
|\ \ \ \ | | | | | | | | | | os_firewall fixes
| * | | | os_firewall fixesJason DeTiberus2015-03-092-32/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Fix variable references to os_firewall_{allow,deny} instead of {allow, deny} - Fix ordering of service stop/start to ensure firewall rules are properly initiated after service startup - Add test for package installed before attempting to disable or mask services
* | | | Merge pull request #104 from twiest/fix_multi_ec2_pyThomas Wiest2015-03-091-2/+8
|\ \ \ \ | |/ / / |/| | | fixed bug in new ec2.py destination_format code
| * | | fixed bug in new ec2.py destination_format codeThomas Wiest2015-03-091-2/+8
|/ / /
* | | Merge pull request #102 from detiber/fixFirewallThomas Wiest2015-03-066-22/+17
|\ \ \ | | | | | | | | fixing os_firewall issues
| * | | start fixing os_firewall issuesJason DeTiberus2015-03-066-22/+17
|/ / / | | | | | | | | | | | | - Fix missed references to old firewall scripts - Fix variable name references that didn't get updated
* | | Merge pull request #101 from detiber/SdnWhoopsThomas Wiest2015-03-061-4/+4
|\ \ \ | | | | | | | | Fix issues with openshift_sdn_node
| * | | Fix issues with openshift_sdn_nodeJason DeTiberus2015-03-061-4/+4
| |/ / | | | | | | | | | | | | | | | | | | - Use openshift_hostname (set from openshift_common) instead of calculating it again using the openshift_common variables - Fix the task setting facts for openshift_sdn_node that was using references to master instead
* | | Merge pull request #99 from detiber/openshiftRegisterNodeFixesThomas Wiest2015-03-061-36/+90
|\ \ \ | | | | | | | | openshift_register_node module fixes
| * | | openshift_register_node module fixesJason DeTiberus2015-03-061-36/+90
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set parameters resources and cpu/memory as mutually exclusive - Add parameters for setting the client_user, client_context and client_cluster - This allows the module to ensure it is using the proper context for operation - Node resources weren't properly being registered - wrapped node definition object in a config object to rectify - Reduce default to 75% Total Memory instead of 80% - Don't bother running osc create node if node is already in osc get nodes output
* | | Merge pull request #98 from detiber/copyNotEnvKubeconfigThomas Wiest2015-03-063-8/+36
|\ \ \ | | | | | | | | Do not set KUBECONFIG for root user
| * | | Do not set KUBECONFIG for root userJason DeTiberus2015-03-063-8/+36
| |/ / | | | | | | | | | | | | | | | | | | - instead of setting KUBECONFIG, copy the admin kubeconfig to /root/.kube/.kubeconfig in the openshift_master and openshift_node roles - pause for 30 seconds if the openshift-master service has changed state, since the file we are copying is generated by the master
* | | Merge pull request #96 from detiber/removeNodeWorkaroundThomas Wiest2015-03-061-0/+1
|\ \ \ | |/ / |/| | Provide default value for openshift_node_ips.
| * | Provide default value for openshift_node_ipsJason DeTiberus2015-03-061-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - openshift_node_ips now defaults to [] - Previously an empty --nodes in /etc/sysconfig/master would result in the master creating a node for the localhost. The latest Origin and OSE builds now only create the implicit localhost node if run as openshift, not openshift-master. We can now safely default to setting no nodes in /etc/sysconfig/master and having nodes register themselves with the master when they come up via the 'Register node (if not already registered)' task in roles/openshift_node/tasks/main.yml) - This had an associated change for the byo scripts that had not been merged into master yet, but this PR changes the behavior of the openshift_master role to not fail if openshift_node_ips is not set. This also prevents having the openshift_master service restarted when a node is added.
* | Merge pull request #94 from detiber/iptablesThomas Wiest2015-03-0621-81/+500
|\ \ | | | | | | Add iptables firewall support to openshift-common
| * | rename base_os role to os_env_extras, move application to end since it just ↵Jason DeTiberus2015-03-058-6/+6
| | | | | | | | | | | | sets environment configs for root user
| * | refactor firewall management into new roleJason DeTiberus2015-03-0512-59/+477
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add os_firewall role - Remove firewall settings from base_os, add wait task to os_firewall - Added a iptables firewall module for maintaining the following (in a mostly naive manner): - ensure the OPENSHIFT_ALLOW chain is defined - ensure that there is a jump rule in the INPUT chain for OPENSHIFT_ALLOW - adds or removes entries from the OPENSHIFT_ALLOW chain - issues '/usr/libexec/iptables/iptables.init save' when rules are changed - Limitations of iptables firewall module - only allows setting of ports/protocols to open - no testing on ipv6 support - made os_firewall a dependency of openshift_common - Hardcoded openshift_common to use iptables (through the vars directory) until upstream support is in place for firewalld
| * | add vim vim modeline to ansible modulesJason DeTiberus2015-03-051-0/+1
|/ /
* | Merge pull request #95 from a13m/destination_formatThomas Wiest2015-03-042-62/+251
|\ \ | | | | | | Add flexible destination format string to ec2.py
| * | Add flexible destination format string to ec2.pyAndy Grimm2015-03-042-1/+12
| | | | | | | | | | | | | | | This allows us to construct hostnames from a format string plus ec2 tag values.