summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1123 from brenton/manageiqBrenton Leanhardt2016-01-062-1/+31
|\ | | | | We can't enable manageiq for installations less than OSE 3.1 or Origi…
| * We can't enable manageiq for installations less than OSE 3.1 or Origin 1.1Brenton Leanhardt2016-01-062-1/+31
| | | | | | | | This is because 'oadmn policy add-scc-to-user' didn't exist in 3.0
* | Merge pull request #1113 from lhuard1A/fix_subscriptionThomas Wiest2016-01-061-1/+9
|\ \ | | | | | | Fix RHN subscription by explicitly attaching to the right pool
| * | Fix RHN subscription by explicitly attaching to the right poolLénaïc Huard2016-01-061-1/+9
| | |
* | | Merge pull request #1018 from abutcher/secretsBrenton Leanhardt2016-01-067-37/+112
|\ \ \ | | | | | | | | Clean up idempotency issues with session secrets.
| * | | Move extra secret validations into openshift_facts.Andrew Butcher2016-01-063-22/+15
| | | |
| * | | openshift_facts validationAndrew Butcher2016-01-044-46/+55
| | | |
| * | | Secrets validation.Andrew Butcher2016-01-043-5/+52
| | | |
| * | | Clean up idempotency issues with session secrets.Andrew Butcher2016-01-045-29/+55
| | | |
* | | | Merge pull request #1124 from abutcher/container-virt_use_nfsBrenton Leanhardt2016-01-061-3/+2
|\ \ \ \ | | | | | | | | | | Remove not is_containerized restriction on storage plugin includes.
| * | | | Remove not is_containerized restriction on storage plugin includes.Andrew Butcher2016-01-061-3/+2
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.22-1].Kenny Woodson2016-01-062-2/+9
| |_|_|/ |/| | |
* | | | Merge pull request #1120 from joelddiaz/sdn-resetJoel Diaz2016-01-061-0/+53
|\ \ \ \ | | | | | | | | | | playbook for restarting SDN
| * | | | playbook for restarting SDNJoel Diaz2016-01-051-0/+53
|/ / / /
* | | | Merge pull request #1116 from abutcher/uninstall-haproxyBrenton Leanhardt2016-01-051-0/+2
|\ \ \ \ | | | | | | | | | | Stop haproxy and remove package during uninstall.
| * | | | Stop haproxy and remove package during uninstall.Andrew Butcher2016-01-051-0/+2
| |/ / /
* | | | Merge pull request #1107 from donovanmuller/patch-1Brenton Leanhardt2016-01-053-2/+8
|\ \ \ \ | |/ / / |/| | | Group name as per hosts.origin.example
| * | | Group name as per hosts.origin.exampleDonovan Muller2016-01-053-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example inventory file does not currently work and fails with: PLAY [Gather Cluster facts] *************************************************** skipping: no hosts matched PLAY RECAP ******************************************************************** this is because the group name is actually OSEv3 (inline with https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.origin.example#L4) and not OSv3. Also added references to inventory/byo/hosts.[origin,ose,aep].example for more complete examples.
* | | | Merge pull request #1112 from cooktheryan/masterThomas Wiest2016-01-051-1/+1
|\ \ \ \ | | | | | | | | | | Incorrect AMI id
| * | | | I believe the ami id changed since the initial documentation was created for ↵Ryan Cook2016-01-041-1/+1
| | |_|/ | |/| | | | | | | | | | AWS deployment
* | | | Automatic commit of package [openshift-ansible] release [3.0.21-1].Brenton Leanhardt2016-01-052-2/+77
| | | |
* | | | Merge pull request #1109 from abutcher/equal-signBrenton Leanhardt2016-01-051-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo in etcd service status fact.
| * | | Fix typo in etcd service status fact.Andrew Butcher2016-01-041-1/+1
| | | |
* | | | Merge pull request #1105 from EricMountain-1A/fix-restart-docker-handlerBrenton Leanhardt2016-01-043-4/+10
|\ \ \ \ | | | | | | | | | | Fix Docker restart handling
| * | | | Fixes typo assigning docker_service_status_changed which leads to ↵Eric Mountain2015-12-293-4/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | misinterpretation in handler. Fixes Docker restart handling to ensure openshift_docker role does restart Docker on change.
* | | | Merge pull request #1110 from abutcher/argsBrenton Leanhardt2016-01-044-2/+20
|\ \ \ \ | | | | | | | | | | Fix osm_controller_args and osm_api_server_args settings.
| * | | | Fix osm_controller_args and osm_api_server_args settings.Andrew Butcher2016-01-044-2/+20
| | | | |
* | | | | Merge pull request #1050 from enoodle/propose_manageiq_as_defaultBrenton Leanhardt2016-01-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Propose adding ManageIQ service account by default
| * | | | | Adding ManageIQ service account by defaultenoodle2015-12-301-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: enoodle <efreiber@redhat.com>
* | | | | Merge pull request #958 from kwoodson/envfixKenny Woodson2016-01-0452-267/+378
|\ \ \ \ \ | |_|/ / / |/| | | | Fixing meta data tags env and environment
| * | | | Fix error in byo cluster_hosts.ymlJason DeTiberus2016-01-045-5/+10
| | | | |
| * | | | Cleanup and fixes for cluster_id changeJason DeTiberus2016-01-0428-219/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move debug_level into vars.yml and byo inventory - change variables in cluster_hosts.yml to be g_* and update playbooks to use those values directly instead of setting them indirectly - added a new g_all_hosts entry in cluster_hosts to use in the update playbook instead of unioning all host types within the playbook - added a cluster_hosts.yml for the byo playbook
| * | | | Removing environment and env tags.Kenny Woodson2016-01-0438-170/+301
| | | | |
* | | | | Merge pull request #1108 from abutcher/kube-argsBrenton Leanhardt2016-01-043-0/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | Add node kubelet args to inventory examples.
| * | | | Add node kubelet args to inventory examples.Andrew Butcher2016-01-043-0/+9
|/ / / /
* | | | Merge pull request #1101 from sdodson/bz1292684Brenton Leanhardt2016-01-041-1/+1
|\ \ \ \ | |/ / / |/| | | Install iptables, iptables-services when not is_aotmic
| * | | Install iptables, iptables-services when not is_aotmicScott Dodson2015-12-221-1/+1
| | | |
* | | | Merge pull request #951 from abutcher/nfsWesley Hearn2016-01-0424-4/+220
|\ \ \ \ | |_|_|/ |/| | | NFS for registry storage
| * | | Create nfs host group with registry volume attachment.Andrew Butcher2015-12-1524-4/+220
| | | |
* | | | Merge pull request #1095 from abutcher/restartsBrenton Leanhardt2016-01-046-10/+10
|\ \ \ \ | |_|_|/ |/| | | Fix restart handlers
| * | | Fix restart handlers.Andrew Butcher2015-12-266-10/+10
|/ / /
* | | Merge pull request #1096 from git001/masterBrenton Leanhardt2015-12-245-0/+32
|\ \ \ | | | | | | | | Add the new metrics and logging urls v2
| * | | add the necessary URLs for logging and metricsgit0012015-12-225-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the necessary URLs for logging and metrics use the dict in the right way add the new variables into the hosts file add the new variables into the hosts file add the new variables into the hosts file Adopted the config text
* | | | Merge pull request #1103 from abutcher/lb-no-dockerBrenton Leanhardt2015-12-242-1/+2
|\ \ \ \ | | | | | | | | | | Remove lb from docker hosts.
| * | | | Remove lb from docker hosts.Andrew Butcher2015-12-232-1/+2
| | | | |
* | | | | Merge pull request #1094 from abutcher/notifyBrenton Leanhardt2015-12-243-2/+9
|\ \ \ \ \ | |/ / / / |/| | | | Reset Type=notify for controllers service
| * | | | Conditionalize for 3.1.1/1.1.1Andrew Butcher2015-12-182-0/+9
| | | | |
| * | | | Use notify for workaround controllers unit.Andrew Butcher2015-12-182-3/+1
| |/ / /
* | | | Merge pull request #1100 from sdodson/xpaas-1.2-jboss-fuseBrenton Leanhardt2015-12-231-1/+1
|\ \ \ \ | | | | | | | | | | Install all xpaas streams when enabled
| * | | | Install all xpaas streams when enabledScott Dodson2015-12-221-1/+1
| | |_|/ | |/| |