summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * Sync ec2.py with upstreamAndy Grimm2015-03-041-61/+239
|/
* Merge pull request #93 from liangxia/patch-2Thomas Wiest2015-03-031-1/+1
|\ | | | | Correct syntax error of missing quotes
| * Correct syntax error of missing quotesLiang Xia2015-03-031-1/+1
| | | | | | Always quote template expression brackets when they start a value.
* | Merge pull request #92 from liangxia/patch-1Thomas Wiest2015-03-031-3/+3
|\ \ | | | | | | remove extra '}'
| * | remove extra '}'Liang Xia2015-03-031-3/+3
| |/
* | Merge pull request #73 from lhuard1A/fix_aws_cluster_listThomas Wiest2015-03-031-1/+1
|\ \ | | | | | | Fix './cluster.sh list' on AWS when some VMs have no name
| * | Fix './cluster.sh list' on AWS when some VMs have no nameLénaïc Huard2015-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case some AWS VMs have no name (VMs not managed by openshift-online-ansible), './cluster.sh list' fails with the following error: ./cluster.sh list /home/lenaic/doc/prog/RedHat/openshift-online-ansible/lib/aws_helper.rb:31:in `sort_by': comparison of Array with Array failed (ArgumentError) from /home/lenaic/doc/prog/RedHat/openshift-online-ansible/lib/aws_helper.rb:31:in `sort_by!' from /home/lenaic/doc/prog/RedHat/openshift-online-ansible/lib/aws_helper.rb:31:in `get_hosts' from /home/lenaic/doc/prog/RedHat/openshift-online-ansible/lib/aws_command.rb:118:in `list' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor/command.rb:27:in `run' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor/invocation.rb:126:in `invoke_command' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor.rb:359:in `dispatch' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor/invocation.rb:115:in `invoke' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor.rb:235:in `block in subcommand' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor/command.rb:27:in `run' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor/invocation.rb:126:in `invoke_command' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor.rb:359:in `dispatch' from /home/lenaic/.gem/ruby/2.2.0/gems/thor-0.19.1/lib/thor/base.rb:440:in `start' from ./cloud.rb:27:in `block in <main>' from ./cloud.rb:25:in `chdir' from ./cloud.rb:25:in `<main>' With that fix, we get the expected result: ./cluster.sh list Name Env State IP Address Created By ---- --- ----- ---------- ---------- UNSET UNSET running 54.152.46.170 test-openshift-master-92675686da test running 54.152.33.235 lenaic test-openshift-node-2a43dcb0b4 test running 52.1.69.75 lenaic test-openshift-node-94af201376 test running 54.86.4.149 lenaic
* | | Merge pull request #65 from lhuard1A/osxThomas Wiest2015-03-034-4/+15
|\ \ \ | |_|/ |/| | Allows it to run on OSX
| * | Allows it to run on OSXAkram Ben Aissi2015-02-194-4/+15
| |/ | | | | | | | | - Versions of ruby ported on OSX requires escaping of hyphens in regexp - Adds documentation on packages required by OSX to run openshift-online-ansible on OSX
* | Merge pull request #91 from detiber/downWithJSONThomas Wiest2015-03-023-14/+37
|\ \ | | | | | | Prefer YAML style datastructures over JSON
| * | Prefer YAML style datastructures over JSONJason DeTiberus2015-03-023-14/+37
| | | | | | | | | | | | - Switch JSON style datastructures to YAML for debuggability
* | | Merge pull request #90 from detiber/addSdnRolesThomas Wiest2015-03-0210-0/+181
|\ \ \ | | | | | | | | Add openshift_sdn_{master,node} roles
| * | | add openshift_sdn_{master,node} rolesJason DeTiberus2015-03-0210-0/+181
| |/ /
* | | Merge pull request #89 from detiber/registerNodeThomas Wiest2015-03-022-0/+156
|\ \ \ | | | | | | | | openshift_node changes for register_node module
| * | | openshift_node changes for register_node moduleJason DeTiberus2015-03-022-0/+156
| |/ / | | | | | | | | | | | | - add openshift_register_node module to openshift_node role - verifies that node isn't already registered before attempting to register it
* | | Merge pull request #87 from detiber/hostnameWorkaroundVarThomas Wiest2015-03-023-2/+8
|\ \ \ | |/ / |/| | add openshift_hostname workaround var
| * | Add openshift_hostname default variable to openshift_commonJason DeTiberus2015-03-022-2/+2
| | | | | | | | | | | | | | | - for use anywhere the hostname is used that would be dependent on the openshift_hostname_workaround setting.
| * | add openshift_hostname workaround varJason DeTiberus2015-03-023-2/+8
|/ / | | | | | | | | - use openshift_bind_ip for hostname when openshift_hostname_workaround is true - defaults to true to maintain current behavior.
* | Merge pull request #88 from detiber/openshiftRegistryOverrideThomas Wiest2015-03-022-0/+18
|\ \ | | | | | | add support for overriding default registry url
| * | add support for overriding default registry urlJason DeTiberus2015-03-022-0/+18
|/ /
* | Merge pull request #85 from detiber/moveLocalFactsThomas Wiest2015-03-022-12/+14
|\ \ | | | | | | Set local_facts for openshift_{node,master} later in the task list
| * | Set local_facts for openshift_node and openshift_master later in the task listJason DeTiberus2015-03-022-12/+14
|/ /