summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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 #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 #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.
* | | | | | 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
* | | | | | Sync latest enterprise/metrics-deployer.yamlScott Dodson2016-11-142-0/+12
| | | | | |
* | | | | | Sync latest s2i contentScott Dodson2016-11-141-3/+8
|/ / / / /
* | | | | Merge pull request #2562 from sdodson/etcd3Scott Dodson2016-11-145-3/+39
|\ \ \ \ \ | | | | | | | | | | | | etcd upgrade playbooks
| * | | | | Add updates for containerizedScott Dodson2016-11-142-3/+14
| | | | | |
| * | | | | Drop /etc/profile.d/etcdctl.shScott Dodson2016-11-143-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes bash functions for etcdctl2 and etcdctl3 which provide reasonable defaults for etcdctl functions on a host that's configured with openshift_etcd.
* | | | | | Merge pull request #2798 from tbielawa/BZ1389137Tim Bielawa2016-11-141-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix commit-offsets in version detection for containerized installs
| * | | | | | Fix commit-offsets in version detection for containerized installsTim Bielawa2016-11-141-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Applies the chomp_commit_offset logic to container version detection https://bugzilla.redhat.com/show_bug.cgi?id=1389137
* / / / / / Added dependency of os_firewall to docker roleRussell Teague2016-11-145-6/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docker role requires iptables-services to be installed. Added dependency on so_firewall role to ensure the iptables service is installed first. Currently this will only work with iptables and not with firewalld. * Added allow_duplicates to os_firewall role meta * Removed unused task from docker/tasks * Corrected os_firewall Defaults in README
* | | | | Merge pull request #2770 from mtnbikenc/docker-fixRussell Teague2016-11-113-1/+19
|\ \ \ \ \ | | | | | | | | | | | | Resolve docker and iptables service dependencies
| * | | | | Resolve docker and iptables service dependenciesRussell Teague2016-11-113-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docker service adds rules to the iptables configuration to support proper network functionality for running containers. If the service is started prior to iptables, these rules are not properly created. * Ensure iptables is started prior to docker Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1390835
* | | | | | Merge pull request #2600 from mscherer/python3_portingScott Dodson2016-11-101-8/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Port openshift_facts to py3
| * | | | | | Port openshift_facts to py3Michael Scherer2016-10-141-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix configparser import - convert bytes to str using to_native - replace method that did got removed in py3 with six equivalent With ansible 2.2, python 3 start to be supported enough to run non trivial playbooks, and so a test run of openshift-ansible on F24 showed that openshift_facts.py needed to be ported.
* | | | | | | Merge pull request #2777 from dgoodwin/jenkins-role-bindingsScott Dodson2016-11-101-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Reconcile role bindings for jenkins pipeline during upgrade.
| * | | | | | | Reconcile role bindings for jenkins pipeline during upgrade.Devan Goodwin2016-11-101-2/+8
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | https://github.com/openshift/origin/issues/11170 for more info.
* | | | | | | Merge pull request #2766 from andrewklau/masterScott Dodson2016-11-092-19/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Re-sync v1.4 image streams
| * | | | | | | Re-sync v1.4 image streamsAndrew Lau2016-11-092-19/+19
| |/ / / / / /
* / / / / / / Fix typos in openshift_facts gce cloud providerScott Dodson2016-11-091-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug 1390160 Fixes BZ1390160
* | / / / / Revert "Revert openshift.node.nodename changes"Scott Dodson2016-11-083-13/+26
| |/ / / / |/| | | |
* | | | | Merge pull request #2753 from jkhelil/proxy_settingsScott Dodson2016-11-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Always add local dns domain to no_proxy
| * | | | | Always add local dns domain to no_proxyjawed2016-11-081-2/+2
| | | | | |
* | | | | | Merge pull request #2751 from sdodson/BZ1388253Scott Dodson2016-11-083-26/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert openshift.node.nodename changes
| * | | | | | Revert "Fix the nodeName of the OpenShift nodes on OpenStack"Scott Dodson2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aaaf82ba6032d0b1e9c36a39a7eda25b8c5f4b84.
| * | | | | | Revert "Fix OpenStack cloud provider"Scott Dodson2016-11-073-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1f2276fff1e41c1d9440ee8b589042ee249b95d7.
| * | | | | | Revert "Check that OpenStack hostnames are resolvable"Scott Dodson2016-11-071-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3cc2d6b019fa8a05ba480a7425cd654aa051355f.
* | | | | | | Merge pull request #2754 from jprovaznik/flannel_prefixScott Dodson2016-11-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | FIx flannel var name
| * | | | | | | FIx flannel var nameJan Provaznik2016-11-081-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should be FLANNEL_ETCD_PREFIX Related to: #2635
* | | | | | | Merge pull request #2759 from sdodson/flannel-containerizedScott Dodson2016-11-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Install flannel RPM on containerized but not atomic
| * | | | | | | Install flannel RPM on containerized but not atomicScott Dodson2016-11-081-1/+1
| |/ / / / / /
* / / / / / / Refactor default sdn_cluster_network_cidr and sdn_host_subnet_lengthScott Dodson2016-11-071-4/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Inventory values highest priority, then anything in master-config.yaml, then defaults last.
* | | | | | Merge pull request #2652 from smunilla/BZ1320952_default_for_clusterNetworkCIDRScott Dodson2016-11-071-5/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update defaults for clusterNetworkCIDR & hostSubnetLength