diff --git a/pi-dhcp.yml b/pi-dhcp.yml
new file mode 100644
index 0000000..aff2c61
--- /dev/null
+++ b/pi-dhcp.yml
@@ -0,0 +1,22 @@
+---
+- name: Set Up DHCP System
+  hosts: dhcp-server
+  become: true
+
+  tasks:
+    - name: DHCP Daemon is installed
+      apt:
+        name: isc-dhcp-server
+        state: latest
+      notify: Restart DHCPD
+
+    - name: Generate dhcpd.conf
+      template:
+        src: dhcpd.conf.j2
+        dest: "{{ dhcpd_conf_path }}"
+
+  handlers:
+    - name: Restart DHCPD
+      service: 
+        name: isc-dhcpd-server
+        state: restarted
\ No newline at end of file
diff --git a/roles/alvaroaleman.freeipa-client/.gitignore b/roles/alvaroaleman.freeipa-client/.gitignore
new file mode 100644
index 0000000..9721727
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/.gitignore
@@ -0,0 +1,27 @@
+### Files to be ignored by Git ###
+
+# Ruby
+Gemfile.lock
+
+# Vagrant
+/\.vagrant/
+
+# IntelliJ IDEA
+/*\.ipr
+/*\.iws
+/\.idea/
+**/*\.iml
+
+# Eclipse
+/\.classpath
+/\.project
+/\.settings/
+
+# Mac
+**/\.DS_Store
+
+# Custom
+/temp/
+/tmp/
+envvars
+*.swp
diff --git a/roles/alvaroaleman.freeipa-client/.travis.yml b/roles/alvaroaleman.freeipa-client/.travis.yml
new file mode 100644
index 0000000..9e1323d
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/.travis.yml
@@ -0,0 +1,12 @@
+---
+language: python
+python: "2.7"
+before_install:
+  - sudo apt-get update --assume-yes -qq
+  - sudo apt-get install --assume-yes -qq python-apt python-pycurl
+install:
+  - sudo pip install ansible
+script:
+  - ansible --version
+  - ansible-playbook --inventory-file tests/hosts --syntax-check tests/playbook.yml
+  - ansible-playbook --inventory-file tests/hosts --connection=local -vvvv tests/playbook.yml
diff --git a/roles/alvaroaleman.freeipa-client/CHANGELOG.md b/roles/alvaroaleman.freeipa-client/CHANGELOG.md
new file mode 100644
index 0000000..e17659c
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/CHANGELOG.md
@@ -0,0 +1,85 @@
+Remo Wenger (2):
+
+* Add support for RHEL
+* Add RHEL to Requirements
+
+# 1.3.1
+
+fxfitz (2):
+
+* Remove always_run
+* Use recommended change
+
+# 1.3.0
+
+Alvaro Aleman (10):
+
+* Use complex args style
+* More style
+* Fix defaults for Trusty
+* Fix variable namespace for package var
+* Update supported distros
+* Update sample playbook
+* Set test variables in playbook instead of Vagrantfile
+* Add assertion for required variables
+* Update role name in README
+* Add xenial to supported distros
+
+Tomas Dobrovolny (4):
+
+* Make DNS updates optional
+* Correct syntax using variable packages in with_items
+* Run Ubuntu specific tasks for all Debians
+* Add Ubuntu-16 to supported distributions
+
+# 1.2.0
+
+Alvaro Aleman (3):
+
+* Fix changelog ordering
+* Allow to register all routable client ips on DNS
+* Dont replace all DNS servers
+
+# 1.1.0
+
+Alvaro Aleman (14):
+
+* Move variables to role-specific namespace
+* Add consistent role tag
+* Refactor supported_distribution check for readability
+* Add Makefile to make testing easier
+* Make Vagrant not set DNS server by default
+* Use public ipa server for testing
+* Fix dependencies
+* Add no_ntp parameter
+* Add force_join parameter
+* Make hostname parameter optional
+* Fix checkmode
+* Remove obsolete serverspec testing
+* Refactor join for readability
+* Add contribution guidelines
+
+Casey Labs (2):
+
+* Update Ubuntu tasks
+* Adding SSH restart to handlers
+
+# 1.0.0
+
+Alvaro Aleman (8):
+
+* Populate galaxy info
+* Update documentation
+* Disable unused Docker testing
+* Fix naming
+* Fix Vagrant testing
+* Add *.swp files to gitignore
+* Update testing mechanism
+* init
+
+# 0.0.1
+
+* Initial commit
+
+
+<!-- vim: set nofen ts=4 sw=4 et: -->
diff --git a/roles/alvaroaleman.freeipa-client/LICENSE b/roles/alvaroaleman.freeipa-client/LICENSE
new file mode 100644
index 0000000..9591157
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/LICENSE
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
diff --git a/roles/alvaroaleman.freeipa-client/Makefile b/roles/alvaroaleman.freeipa-client/Makefile
new file mode 100644
index 0000000..f619cb5
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/Makefile
@@ -0,0 +1,26 @@
+LOGFILE = /tmp/ansible-freeipaclient-logfile
+
+default: test
+
+clean:
+	- vagrant destroy -f
+
+box: clean
+	# Start vagrant box
+	vagrant up --no-provision --provider $(ANSIBLE_FREEIPACLIENT_VAGRANT_PROVIDER)
+
+checkmode:
+	# Test checkmode
+	ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_CHECKMODE=1 vagrant provision
+
+provision:
+	# Test role
+	vagrant provision
+
+idempotence:
+	# Idempotence test
+	vagrant provision | tee $(LOGFILE) | grep 'changed=0.*failed=0' || (cat $(LOGFILE) && false)
+
+
+test: box checkmode provision idempotence
+	make checkmode
diff --git a/roles/alvaroaleman.freeipa-client/README.md b/roles/alvaroaleman.freeipa-client/README.md
new file mode 100644
index 0000000..9e4ce9b
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/README.md
@@ -0,0 +1,71 @@
+# ansible-freeipa-client
+
+## Synopsis
+
+```yaml
+- hosts: all
+  vars:
+    freeipaclient_server: ipa.demo1.freeipa.org
+    freeipaclient_domain: ipa.demo1.freeipa.org
+    freeipaclient_enroll_user: admin
+    freeipaclient_enroll_pass: Secret123
+  roles:
+     - alvaroaleman.freeipa-client
+```
+
+## Description
+
+This role allows to join clients to an ipa domain
+
+## Requirements
+
+* CentOS 7
+* Red Hat Enterprise Linux 7
+* Fedora 24
+* Ubuntu Trusty
+* Ubuntu Xenial
+* Ubuntu Bionic
+
+## Role Variables
+
+* ``freeipaclient_server``: IP/Hostname of IPA server to use (string, mandatory)
+* ``freeipaclient_domain``: Domain to use (string, mandatory)
+* ``freeipaclient_enroll_user``: Username to enroll host in domain (string, mandatory)
+* ``freeipaclient_enroll_pass``: Password to enroll host in domain (string, mandatory)
+* ``freeipaclient_hostname``: The hostname to use for the client (string, default: output of ``uname -n``)
+* ``freeipaclient_dns_server``: DNS server to configure. This will not do anything if variable is empty (string)
+* ``freeipaclient_force_join``: Whether to overwrite an already existing host entry of requested name (boolean, default: ``false``)
+* ``freeipaclient_enable_ntp``: Whether to enable ntp. Kerberos won't work if the time of master and client drift too much (boolean, default: ``true``)
+* ``freeipaclient_all_ip_addresses``: Whether to add all routable ip addresses to DNS (boolean, default: ``true if not Trusty, else false``)
+
+
+## License
+
+GNU AFFERO GENERAL PUBLIC LICENSE Version 3
+
+## Contributing
+
+If you want to contribute to this repository please be aware that this
+project uses a [gitflow](http://nvie.com/posts/a-successful-git-branching-model/)
+workflow with the next release branch called ``next``.
+
+Please fork this repository and create a local branch split off of the ``next``
+branch and create pull requests back to the origin ``next`` branch.
+
+## Integration testing
+
+This role provides integration tests using Vagrant:
+
+```bash
+cp envvars-vagrant.sample envvars
+EDITOR=vim
+$EDITOR envvars
+source envvars
+make test
+```
+
+## Author information
+
+Alvaro Aleman
+
+<!-- vim: set nofen ts=4 sw=4 et: -->
diff --git a/roles/alvaroaleman.freeipa-client/VERSION b/roles/alvaroaleman.freeipa-client/VERSION
new file mode 100644
index 0000000..d0149fe
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/VERSION
@@ -0,0 +1 @@
+1.3.4
diff --git a/roles/alvaroaleman.freeipa-client/Vagrantfile b/roles/alvaroaleman.freeipa-client/Vagrantfile
new file mode 100644
index 0000000..b177f28
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/Vagrantfile
@@ -0,0 +1,56 @@
+# vim: set ft=ruby ts=2 sw=2 et:
+# -*- mode: ruby -*-
+
+
+VAGRANT_API_VERSION = '2'
+Vagrant.configure(VAGRANT_API_VERSION) do |config|
+
+  if ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_BOXNAME']
+    config.vm.box = ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_BOXNAME']
+  else
+    config.vm.box = 'ubuntu/trusty64'
+  end
+
+  config.vm.define :ansiblefreeipaclienttest do |d|
+
+    d.vm.hostname = 'ansiblefreeipaclienttest'
+    d.vm.synced_folder '.', '/vagrant', id: 'vagrant-root', disabled: true
+
+    d.vm.provision :ansible do |ansible|
+      ansible.playbook = 'tests/playbook.yml'
+      ansible.tags = ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_TAGS']
+      ansible.skip_tags = ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_SKIP_TAGS']
+      ansible.verbose = ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_VERBOSE']
+      if ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_CHECKMODE'] == '1'
+        ansible.raw_arguments = '--check'
+      end
+      ansible.groups = {
+        'vagrant' => ['ansiblefreeipaclienttest']
+      }
+      ansible.limit = 'vagrant'
+      ansible.raw_arguments = [
+        '--diff'
+      ]
+      if ENV['ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_CHECKMODE'] == '1'
+        ansible.raw_arguments << '--check'
+      end
+
+      ::File.directory?('.vagrant/provisioners/ansible/inventory/') do
+        ansible.inventory_path = '.vagrant/provisioners/ansible/inventory/'
+      end
+
+    end
+
+    d.vm.provider :virtualbox do |v|
+      v.customize 'pre-boot', ['modifyvm', :id, '--nictype1', 'virtio']
+      v.customize [ 'modifyvm', :id, '--name', 'ansiblefreeipaclienttest', '--memory', '512', '--cpus', '1' ]
+    end
+
+    d.vm.provider :libvirt do |lv|
+      lv.memory = 1024
+      lv.cpus = 2
+    end
+
+
+  end
+end
diff --git a/roles/alvaroaleman.freeipa-client/ansible.cfg b/roles/alvaroaleman.freeipa-client/ansible.cfg
new file mode 100644
index 0000000..d59540a
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/ansible.cfg
@@ -0,0 +1,4 @@
+[defaults]
+roles_path = ../
+nocows = 1
+retry_files_enabled = False
diff --git a/roles/alvaroaleman.freeipa-client/defaults/main.yml b/roles/alvaroaleman.freeipa-client/defaults/main.yml
new file mode 100644
index 0000000..0ca9376
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+# defaults file for ansible-freeipa-client
+freeipaclient_force_join: false
+freeipaclient_enable_ntp: true
+freeipaclient_all_ip_addresses: "{{ true if ansible_distribution_release != 'trusty' else false }}"
+freeipaclient_enable_dns_updates: true
diff --git a/roles/alvaroaleman.freeipa-client/envvars-vagrant.sample b/roles/alvaroaleman.freeipa-client/envvars-vagrant.sample
new file mode 100644
index 0000000..9ea663a
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/envvars-vagrant.sample
@@ -0,0 +1,9 @@
+# General settings for Vagrant
+export ANSIBLE_FREEIPACLIENT_VAGRANT_BOXNAME=centos/7 # name of the vagrant box to use for testing
+export ANSIBLE_FREEIPACLIENT_VAGRANT_PROVIDER=virtualbox     # name of the vagrant provider to use for testing
+#export ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_TAGS=          # Multiple tags can be specified comma seperated
+unset ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_TAGS             # An empty tags variable leads to an error
+#export ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_SKIP_TAGS=     # Multiple tags can be specified comma seperated
+unset ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_SKIP_TAGS        # An empty skip_tags variable leads to an error
+export ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_VERBOSE=        # May contain one to four 'v's
+export ANSIBLE_FREEIPACLIENT_VAGRANT_ANSIBLE_CHECKMODE=      # 1 to enable, any other value to disable
diff --git a/roles/alvaroaleman.freeipa-client/handlers/main.yml b/roles/alvaroaleman.freeipa-client/handlers/main.yml
new file mode 100644
index 0000000..71327e4
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/handlers/main.yml
@@ -0,0 +1,20 @@
+---
+# handlers file for ansible-freeipa-client
+#
+- name: restart sssd
+  tags:
+    - sssd
+    - freeipaclient
+  become: true
+  service:
+    name=sssd
+    state=restarted
+
+- name: restart ssh
+  tags:
+    - sssd
+    - freeipaclient
+  become: true
+  service:
+    name=ssh
+    state=restarted
diff --git a/roles/alvaroaleman.freeipa-client/meta/.galaxy_install_info b/roles/alvaroaleman.freeipa-client/meta/.galaxy_install_info
new file mode 100644
index 0000000..3b45e37
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Tue Nov 20 16:00:28 2018', version: 1.3.4}
diff --git a/roles/alvaroaleman.freeipa-client/meta/main.yml b/roles/alvaroaleman.freeipa-client/meta/main.yml
new file mode 100644
index 0000000..f7c4604
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/meta/main.yml
@@ -0,0 +1,23 @@
+---
+galaxy_info:
+  author: Alvaro Aleman
+  description: A role to join clients to an IPA domain
+  license: AGPLv3
+  min_ansible_version: 2.1
+  platforms:
+  - name: EL
+    versions:
+    - 7
+  - name: Fedora
+    versions:
+    - 24
+  - name: Ubuntu
+    versions:
+    - trusty
+    - xenial
+  categories:
+  - system
+  - identity
+  - ldap
+  - kerberos
+dependencies: []
diff --git a/roles/alvaroaleman.freeipa-client/scripts/release.sh b/roles/alvaroaleman.freeipa-client/scripts/release.sh
new file mode 100755
index 0000000..57d2c88
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/scripts/release.sh
@@ -0,0 +1,179 @@
+#!/bin/bash
+
+##Always exit on $? -ne 0
+set -e
+##
+
+_cleanup()
+{
+  rm $FILENAME_TMPCHANGELOG &>/dev/null
+}
+
+##### Create a release for a project managed with a Git repository #####
+
+
+
+### Functions ###
+
+# Confirm dialog for user interactions
+# Usage: confirm "Question?"
+# Returns: 0 = true, 1 = false
+confirm() {
+  read -r -p "$1 [y/n] " response
+  case $response in
+    [yY][eE][sS]|[yY])
+      return 0;;
+    *)
+      return 1;;
+  esac
+}
+
+### Display usage message
+usage () {
+  echo "Usage: $0 [-v VERSION] [-r REMOTE] -s 'One line summary of changes for this release'"
+  exit 0
+}
+
+
+### Initialize the variables and settings ###
+#Variables
+RELEASE_VERSION=
+REMOTE=
+SHORT_SUMMARY=
+
+while getopts v:r:s: OPT; do
+  case $OPT in
+      v) RELEASE_VERSION="${OPTARG}";;
+      r) REMOTE="${OPTARG}";;
+      s) SHORT_SUMMARY="${OPTARG}";;
+  esac
+done
+shift $(( $OPTIND - 1 ));
+
+if [ -z "${SHORT_SUMMARY}" ]; then
+  usage && exit 0
+fi
+
+: ${REMOTE:=origin}
+
+FILENAME_TMPCHANGELOG="$( mktemp --suffix=ansible_role_release_changelog )"
+
+trap _cleanup ALRM HUP INT TERM EXIT
+
+# Fetch Git remote inormation
+git fetch $REMOTE --tags
+
+# Some information can be detected
+LAST_VERSION=$( git tag -l | tail -n 1 )
+REPOSITORY_NAME=$( git remote show -n $REMOTE | grep Fetch | sed 's#.*/##' | sed 's/\.git//' )
+EXISTING_TAGS=`git tag -l`
+
+# Detect version if not provided by user
+if [[ -z "${RELEASE_VERSION}" ]]; then
+  RELEASE_VERSION=$(echo $LAST_VERSION|awk -F . '{print $1 "." $2 + 1 "." $3}')
+fi
+
+RELEASE_BRANCH="release/${RELEASE_VERSION}"
+# Check if there is already a tag named $RELEASE_VERSION
+## Temporary disabling exit on $? -ne 0 to be able to display error message
+set +e
+if [[ $EXISTING_TAGS =~ "$RELEASE_VERSION" ]]; then
+  >&2 echo "A tag $RELEASE_VERSION already exists!"
+  >&2 echo "Aborting.."
+  exit 1
+fi
+set -e
+
+
+# Confirm or exit
+echo
+echo "Settings for the release to be created:"
+echo "  Version of last release:  ${LAST_VERSION}"
+echo "  Version of new release:   ${RELEASE_VERSION}"
+echo "  Name of Git repository:   ${REPOSITORY_NAME}"
+echo "  Summary text for release: ${SHORT_SUMMARY}"
+if ! confirm "Continue with these settings?"; then
+  exit 1
+fi
+
+
+
+### Perform release ###
+
+echo
+echo "Checkout and pull next branch"
+git checkout next
+git pull $REMOTE next
+
+echo
+echo "Checkout new release branch"
+git checkout -b ${RELEASE_BRANCH}
+
+echo
+echo "Write VERSION file"
+echo ${RELEASE_VERSION} > VERSION
+
+echo
+echo "Add release information to CHANGELOG.md file"
+
+cat CHANGELOG.md > $FILENAME_TMPCHANGELOG
+echo "# ${RELEASE_VERSION}" > CHANGELOG.md
+echo "" >> CHANGELOG.md
+
+if [[ -n ${LAST_VERSION} ]]; then
+  git shortlog --no-merges next --not ${LAST_VERSION} | sed -e '/^[ \t]/s#^[ \t]*#* #' | perl -pe 's/:$/:\n/g' >> CHANGELOG.md
+  cat $FILENAME_TMPCHANGELOG >> CHANGELOG.md
+else
+  git shortlog --no-merges next | sed -e '/^[ \t]/s#^[ \t]*#* #' | perl -pe 's/:$/:\n/g' >> CHANGELOG.md
+  cat $FILENAME_TMPCHANGELOG >> CHANGELOG.md
+fi
+echo "Please verify and adjust version information that was prepended to CHANGELOG.md file"
+echo "Diff looks like this:"
+echo
+echo '###### Diff start ######'
+
+## Disable exit on $? -ne 0 for the diff command, since it returns $? == 1 if a diff was found
+set +e
+diff -u $FILENAME_TMPCHANGELOG CHANGELOG.md
+set -e
+
+echo '###### Diff end ######'
+echo
+echo "In case this is not correct, press ctrl+z to pause this script, adjust CHANGELOG.md and get back using the fg command"
+while ! confirm "Continue?"; do
+  echo "And now?"
+done
+
+echo
+echo "Commit generated release information"
+rm -f $FILENAME_TMPCHANGELOG
+git add VERSION
+git add CHANGELOG.md
+git commit -m "${REPOSITORY_NAME} ${RELEASE_VERSION}: ${SHORT_SUMMARY}"
+
+echo
+echo "Checkout and pull master branch"
+git checkout master
+git pull $REMOTE master
+
+echo
+echo "Merge release branch to master branch"
+git merge --no-ff --log --no-edit ${RELEASE_BRANCH}
+
+echo
+echo "Create release tag ${RELEASE_VERSION}"
+git tag -a ${RELEASE_VERSION} -m "${REPOSITORY_NAME} ${RELEASE_VERSION}: ${SHORT_SUMMARY}"
+
+echo
+echo "Merge release branch to next branch"
+git checkout next
+git merge ${RELEASE_BRANCH}
+
+echo
+echo "Delete release branch - it's obsolete now"
+git branch -d ${RELEASE_BRANCH}
+
+echo
+echo "Push all changes to remote repository"
+git push $REMOTE master next ${RELEASE_VERSION}
+exit 0
diff --git a/roles/alvaroaleman.freeipa-client/tasks/main.yml b/roles/alvaroaleman.freeipa-client/tasks/main.yml
new file mode 100644
index 0000000..7402119
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/tasks/main.yml
@@ -0,0 +1,95 @@
+---
+# tasks file for ansible-freeipa-client
+
+- name: Assert supported distribution
+  tags:
+    - assertion
+    - freeipaclient
+  assert:
+    that:
+      - ansible_distribution + '-' + ansible_distribution_major_version in freeipaclient_supported_distributions
+
+- name: Assert required variables
+  tags:
+    - assertion
+    - freeipaclient
+  assert:
+    that:
+      - freeipaclient_server is defined
+      - freeipaclient_domain is defined
+      - freeipaclient_enroll_user is defined
+      - freeipaclient_enroll_pass is defined
+
+- name: Import variables
+  tags:
+    - import
+    - freeipaclient
+  include_vars: "{{ ansible_distribution }}.yml"
+
+- name: Set DNS server
+  tags:
+    - dns
+    - freeipaclient
+  become: true
+  when: freeipaclient_dns_server is defined
+  lineinfile:
+    state: present
+    line: "nameserver {{ freeipaclient_dns_server }}"
+    dest: /etc/resolv.conf
+
+- name: Update apt cache
+  tags:
+    - packagemanagement
+    - freeipaclient
+  become: true
+  when: ansible_pkg_mgr  == 'apt'
+  apt:
+    update_cache: true
+    cache_valid_time: 3600
+
+- name: Install required packages
+  tags:
+    - packagemanagement
+    - freeipaclient
+  become: true
+  with_items: "{{ freeipaclient_packages }}"
+  package:
+    state: present
+    name: "{{ item }}"
+
+- name: Check if host is enrolled
+  tags:
+    - enroll
+    - freeipaclient
+  register: freeipaclient_ipaconf
+  check_mode: no
+  stat:
+    path: /etc/ipa/default.conf
+
+- name: Enroll host in domain
+  tags:
+    - enroll
+    - freeipaclient
+  become: true
+  when: not freeipaclient_ipaconf.stat.exists
+  command: >
+    {{ freeipaclient_install_command }}
+    {{'--hostname=' + freeipaclient_hostname  if freeipaclient_hostname is defined else '--hostname=' + ansible_nodename }}
+    --server={{ freeipaclient_server }}
+    --domain={{ freeipaclient_domain }}
+    --principal={{ freeipaclient_enroll_user }}
+    --password={{ freeipaclient_enroll_pass }}
+    --ssh-trust-dns
+    --mkhomedir
+    {{ '--enable-dns-updates' if freeipaclient_enable_dns_updates else ''}}
+    --unattended
+    {{ '--all-ip-addresses' if freeipaclient_all_ip_addresses else ''}}
+    {{ '--no-ntp' if not freeipaclient_enable_ntp else ''}}
+    {{ '--force-join' if freeipaclient_force_join else ''}}
+
+- name: Include Ubuntu specific tasks
+  tags:
+    - ubuntu
+    - freeipaclient
+  when: ansible_os_family == 'Debian'
+  include: ubuntu.yml
diff --git a/roles/alvaroaleman.freeipa-client/tasks/ubuntu.yml b/roles/alvaroaleman.freeipa-client/tasks/ubuntu.yml
new file mode 100644
index 0000000..5385d63
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/tasks/ubuntu.yml
@@ -0,0 +1,23 @@
+- name: Enable mkhomedir
+  tags:
+    - ubuntu
+    - mkhomedir
+    - freeipaclient
+  become: true
+  lineinfile:
+    dest: /etc/pam.d/common-session
+    line: 'session     required      pam_mkhomedir.so skel=/etc/skel umask=0022'
+
+- name: Enable sssd sudo functionality
+  tags:
+    - ubuntu
+    - sssd
+    - freeipaclient
+  become: true
+  notify:
+    - restart sssd
+    - restart ssh
+  lineinfile:
+    dest: /etc/sssd/sssd.conf
+    regexp: '^services.*'
+    line: 'services = nss, pam, ssh, sudo'
diff --git a/roles/alvaroaleman.freeipa-client/tests/hosts b/roles/alvaroaleman.freeipa-client/tests/hosts
new file mode 100644
index 0000000..2fbb50c
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/tests/hosts
@@ -0,0 +1 @@
+localhost
diff --git a/roles/alvaroaleman.freeipa-client/tests/playbook.yml b/roles/alvaroaleman.freeipa-client/tests/playbook.yml
new file mode 100644
index 0000000..e01cc52
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/tests/playbook.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all
+  vars:
+    freeipaclient_force_join: true
+    freeipaclient_server: ipa.demo1.freeipa.org
+    freeipaclient_domain: ipa.demo1.freeipa.org
+    freeipaclient_enroll_user: admin
+    freeipaclient_enroll_pass: Secret123
+    freeipaclient_hostname: ansible-freeipa-client-test.demo1.freeipa.org
+  roles:
+    - ansible-freeipa-client
diff --git a/roles/alvaroaleman.freeipa-client/vars/CentOS.yml b/roles/alvaroaleman.freeipa-client/vars/CentOS.yml
new file mode 100644
index 0000000..25a9bfc
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/vars/CentOS.yml
@@ -0,0 +1,4 @@
+freeipaclient_install_command: '/sbin/ipa-client-install'
+freeipaclient_packages:
+ - ipa-client
+ - dbus-python
diff --git a/roles/alvaroaleman.freeipa-client/vars/Fedora.yml b/roles/alvaroaleman.freeipa-client/vars/Fedora.yml
new file mode 100644
index 0000000..eb04b9a
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/vars/Fedora.yml
@@ -0,0 +1,3 @@
+freeipaclient_install_command: '/sbin/ipa-client-install'
+freeipaclient_packages:
+ - freeipa-client
diff --git a/roles/alvaroaleman.freeipa-client/vars/RedHat.yml b/roles/alvaroaleman.freeipa-client/vars/RedHat.yml
new file mode 100644
index 0000000..25a9bfc
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/vars/RedHat.yml
@@ -0,0 +1,4 @@
+freeipaclient_install_command: '/sbin/ipa-client-install'
+freeipaclient_packages:
+ - ipa-client
+ - dbus-python
diff --git a/roles/alvaroaleman.freeipa-client/vars/Ubuntu.yml b/roles/alvaroaleman.freeipa-client/vars/Ubuntu.yml
new file mode 100644
index 0000000..1d4b507
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/vars/Ubuntu.yml
@@ -0,0 +1,4 @@
+freeipaclient_install_command: '/usr/sbin/ipa-client-install'
+freeipaclient_packages:
+ - freeipa-client
+ - dnsutils
diff --git a/roles/alvaroaleman.freeipa-client/vars/main.yml b/roles/alvaroaleman.freeipa-client/vars/main.yml
new file mode 100644
index 0000000..ebcf316
--- /dev/null
+++ b/roles/alvaroaleman.freeipa-client/vars/main.yml
@@ -0,0 +1,9 @@
+---
+# vars file for ansible-freeipa-client
+freeipaclient_supported_distributions:
+  - Ubuntu-14
+  - Ubuntu-16
+  - Ubuntu-18
+  - CentOS-7
+  - RedHat-7
+  - Fedora-24
diff --git a/roles/ansible-role-redhat_satellite6_installation b/roles/ansible-role-redhat_satellite6_installation
new file mode 120000
index 0000000..4eb2335
--- /dev/null
+++ b/roles/ansible-role-redhat_satellite6_installation
@@ -0,0 +1 @@
+/Users/ptoal/Dev/ansible-role-redhat_satellite6_installation
\ No newline at end of file
diff --git a/satellite.yml b/satellite.yml
new file mode 100644
index 0000000..608df57
--- /dev/null
+++ b/satellite.yml
@@ -0,0 +1,217 @@
+# Playbook to install Satellite server on RHV
+
+# TODO: Autocreate pxeboot environment on tftp server. This was a partial attempt to create the ks file
+# and dump it on the NAS.   
+# Note for my future self: Don't bother trying to attach a VFD/ISO with the ks file.  It will all
+# end in tears, because RHV4.2 doesn't have the APIs / functionality.
+
+# - name: Prepare Kickstart Files
+#   hosts: vms
+#   connection: local
+#   gather_facts: no
+      
+#   tasks:
+    # - name: Get first nfs server
+    #   set_fact: ks_nfs_server="{{ groups['nfs-server'][0] }}"
+    # - set_fact: ks_file="{{ hostvars[ks_nfs_server]['nfs_dir'] }}/{{ inventory_hostname }}.cfg"
+
+    # - name: Copy ks file to builddir
+    #   template:
+    #     src: templates/ks.cfg
+    #     dest: "{{ ks_file }}"
+    #   delegate_to: "{{ ks_nfs_server }}"
+
+- name: Create VMs
+  hosts: vms
+  connection: local
+  gather_facts: no
+  # Never run this, unless specifically enabled
+  tags: 
+   - never
+   - rebuild
+  vars:
+    # Hack to work around virtualenv python interpreter
+    ansible_python_interpreter: "{{ ansible_playbook_python }}"
+
+  tasks:
+    - name: Remove known_hosts entry
+      known_hosts:
+        name: "{{ inventory_hostname }}"
+        state: absent
+
+    - name: Create VM Disks
+      ovirt_disk:
+        auth: "{{ ovirt_auth }}"
+        name: '{{ item.name }}'
+        description: '{{ item.descr }}'
+        interface: '{{ item.interface }}'
+        size: '{{ item.size }}'
+        state: '{{ item.state }}'
+        sparse: '{{ item.sparse }}'
+        wait: true
+        storage_domain: "{{ item.storage_domain }}"
+      async: 300
+      poll: 15
+      loop: "{{ vm_disks }}"
+      # If we change the disks, we will PXE Boot the Server for install
+      notify: PXE Boot
+
+    - name: Create Satellite VM in RHV
+      ovirt_vm:
+        auth: "{{ ovirt_auth }}"
+        name: "{{ vm_name }}"
+        state: present
+        memory: "{{ vm_memory }}"
+        disks: "{{ vm_disks }}"
+        cpu_cores: "{{ vm_cpu_cores }}"
+        operating_system: "{{ vm_os }}"
+        cluster: "{{ vm_cluster }}"
+        type: server
+        graphical_console:
+          protocol:
+            - spice
+            - vnc
+        cluster: Default
+        boot_devices:
+          - hd
+      async: 300
+      poll: 15
+
+    - name: Assign NIC
+      ovirt_nic:
+        auth: "{{ ovirt_auth }}"
+        interface: virtio
+        mac_address: "{{ vm_mac_address }}"
+        name: nic1
+        profile: ovirtmgmt
+        network: ovirtmgmt
+        state: plugged
+        vm: "{{ vm_name }}"
+
+  handlers:    
+    - name: PXE Boot
+      ovirt_vm:
+        auth: "{{ ovirt_auth }}"
+        name: "{{ vm_name }}"
+        boot_devices:
+         - network
+        state: running
+      register: vm_build_result
+
+- name: Ensure Satellite is running and reachable
+  hosts: satellite
+  gather_facts: no
+  connection: local
+  vars:
+    # Hack to work around virtualenv python interpreter
+    ansible_python_interpreter: "{{ ansible_playbook_python }}"
+ 
+  tasks: 
+    - name: VM is running
+      ovirt_vm:
+          auth: "{{ ovirt_auth }}"
+          name: "{{ vm_name }}"
+          state: running
+          boot_devices:
+          - hd
+      
+    - name: Wait for SSH to be ready
+      wait_for_connection:
+        timeout: 1800
+        sleep: 5
+        
+- name: Set up ipa-client
+  hosts: satellite
+  remote_user: root
+  vars:
+    ansible_ssh_pass: "{{ satellite_root_pass }}"
+  become: no
+  roles:
+    - alvaroaleman.freeipa-client 
+  pre_tasks:
+    - name: Register to RHSM and connect to Satellite Subscription.
+      tags: rhsm
+      redhat_subscription:
+        state: present
+        auto_attach: yes
+        username: "{{ rhn_username }}"
+        password: "{{ rhn_password }}"
+        pool: "^Red Hat Satellite Infrastructure Subscription$"
+    - name: Set hostname
+      hostname: 
+        name: "{{ansible_host}}"
+
+- name: Configure Satellite Servers
+  hosts: satellite
+  become: true
+  roles:
+    - ansible-role-redhat_satellite6_installation
+  pre_tasks:
+      # This could take a while, if we are creating the VM from scratch, and installing
+    # the base software
+
+    # - name: Required Satellite Repos
+    #   tags: rhsm
+    #   rhsm_repository:
+    #     name: "{{ item }}"
+    #     state: present
+    #   with_items:
+    #     - rhel-7-server-rpms 
+    #     - rhel-server-rhscl-7-rpms
+    #     - rhel-7-server-satellite-6.4-rpms
+    #     - rhel-7-server-satellite-maintenance-6-rpms
+    #     - rhel-7-server-ansible-2.6-rpms
+    #     - rhel-7-server-rh-common-rpms
+
+    - name: Ensure latest versions of packages
+      yum:
+        name: "*"
+        state: latest
+
+    - name: Chronyd Installed
+      yum:
+        name: chrony
+        state: latest
+      notify: Restart Chrony
+
+    - name: IdM Client
+      yum:
+        name: ipa-client
+        state: latest
+
+    - name: Latest Version of SOS
+      yum:
+        name: sos
+        state: latest
+
+# TODO: Make this work
+# For now:
+# hammer user-group create --admin yes --name satellite_admins
+# hammer user-group external create  --name satellite_admins --user-group satellite_admins --auth-source-id 3
+
+# - name: Satellite configuration
+#   hosts: satellite
+#   gather_facts: no
+#   connection: local
+#   vars:
+#     # Hack to work around virtualenv python interpreter
+#     ansible_python_interpreter: "{{ ansible_playbook_python }}"
+
+#   tasks:
+#     - foreman:
+#         username: admin
+#         password: "{{satellite_deployment_admin_password}}"
+#         server_url: "https://{{satellite_deployment_hostname_full}}"
+#         entity: user-group
+#         params:
+#           name: satellite_admins
+#           admin: yes
+
+#     - foreman:
+#         username: admin
+#         password: "{{satellite_deployment_admin_password}}"
+#         server_url: "https://{{satellite_deployment_hostname_full}}"
+#         entity: 
+#         params:
+#           name: satellite_admins
+#           admin: yes
diff --git a/templates/dhcpd.conf.j2 b/templates/dhcpd.conf.j2
new file mode 100644
index 0000000..338570e
--- /dev/null
+++ b/templates/dhcpd.conf.j2
@@ -0,0 +1,77 @@
+# dhcpd.conf
+#
+# Configuration file for ISC dhcpd
+#
+# option definitions common to all supported networks...
+option domain-name "toal.ca";
+option domain-name-servers 192.168.1.1;
+
+default-lease-time 600;
+max-lease-time 7200;
+
+# The ddns-updates-style parameter controls whether or not the server will
+# attempt to do a DNS update when a lease is confirmed. We default to the
+# behavior of the version 2 packages ('none', since DHCP v2 didn't
+# have support for DDNS.)
+ddns-update-style interim;
+
+update-static-leases on;
+
+# If this DHCP server is the official DHCP server for the local
+# network, the authoritative directive should be uncommented.
+authoritative;
+
+# Use this to send dhcp log messages to a different log file (you also
+# have to hack syslog.conf to complete the redirection).
+#log-facility local7;
+
+# No service will be given on this subnet, but declaring it helps the
+# DHCP server to understand the network topology.
+
+# LAN Subnet (Currently served by pfSense)
+subnet 192.168.1.0 netmask 255.255.255.0 {
+  range 192.168.1.101 192.168.1.160;
+  option domain-name "lan.toal.ca";
+  option domain-search "toal.ca", "lan.toal.ca";
+
+}
+
+# Lab Subnet
+subnet 192.168.90.0 netmask 255.255.255.0 {
+  range 192.168.90.10 192.168.90.240;
+  option routers 192.168.90.1;
+  option domain-name "lab.toal.ca";
+}
+
+host sat6 {
+ hardware ethernet 00:1a:4a:16:01:52;
+ fixed-address sat6.lab.toal.ca;
+#  filename "vmunix.passacaglia";
+#  server-name "toccata.example.com";
+}
+
+# You can declare a class of clients and then do address allocation
+# based on that.   The example below shows a case where all clients
+# in a certain class get addresses on the 10.17.224/24 subnet, and all
+# other clients get addresses on the 10.0.29/24 subnet.
+
+#class "foo" {
+#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
+#}
+
+#shared-network 224-29 {
+#  subnet 10.17.224.0 netmask 255.255.255.0 {
+#    option routers rtr-224.example.org;
+#  }
+#  subnet 10.0.29.0 netmask 255.255.255.0 {
+#    option routers rtr-29.example.org;
+#  }
+#  pool {
+#    allow members of "foo";
+#    range 10.17.224.10 10.17.224.250;
+#  }
+#  pool {
+#    deny members of "foo";
+#    range 10.0.29.10 10.0.29.230;
+#  }
+#}
\ No newline at end of file
diff --git a/templates/ks.cfg b/templates/ks.cfg
new file mode 100644
index 0000000..558fba2
--- /dev/null
+++ b/templates/ks.cfg
@@ -0,0 +1,23 @@
+lang en_CA
+keyboard us
+timezone America/Toronto --isUtc
+rootpw $1$3Sx/AUYD$VOS6XPI5U5x3pW4CA6m1y0 --iscrypted
+sshpw --username=ptoal $1$3Sx/AUYD$VOS6XPI5U5x3pW4CA6m1y0 --iscrypted
+#platform x86, AMD64, or Intel EM64T
+reboot
+text
+cdrom
+bootloader --location=mbr --append="rhgb quiet crashkernel=auto"
+zerombr
+clearpart --none
+autopart
+eula --agreed
+network --device=eth0 --bootproto=static --ip=192.168.90.2 --netmask=255.255.255.0 --gateway=192.168.90.1 --nameserver=192.168.90.1
+auth --passalgo=sha512 --useshadow
+selinux --enforcing
+firewall --enabled --ssh
+skipx
+firstboot --disable
+%packages
+@base
+%end