7 files changed, 72 insertions, 4 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 2f7416283..082d9df3f 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.0.21-1 ./
+3.0.22-1 ./
diff --git a/README_AEP.md b/README_AEP.md
index 83e575ebe..584a7afff 100644
--- a/README_AEP.md
+++ b/README_AEP.md
@@ -98,6 +98,8 @@ aep3-node[1:2].example.com
 The hostnames above should resolve both from the hosts themselves and
 the host where ansible is running (if different).
 
+A more complete example inventory file ([hosts.aep.example](https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.aep.example)) is available under the [`/inventory/byo`](https://github.com/openshift/openshift-ansible/tree/master/inventory/byo) directory.
+
 ## Running the ansible playbooks
 From the openshift-ansible checkout run:
 ```sh
diff --git a/README_OSE.md b/README_OSE.md
index 524950d51..66fba33e5 100644
--- a/README_OSE.md
+++ b/README_OSE.md
@@ -105,6 +105,8 @@ ose3-node[1:2].example.com
 The hostnames above should resolve both from the hosts themselves and
 the host where ansible is running (if different).
 
+A more complete example inventory file ([hosts.ose.example](https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.ose.example)) is available under the [`/inventory/byo`](https://github.com/openshift/openshift-ansible/tree/master/inventory/byo) directory.
+
 ## Running the ansible playbooks
 From the openshift-ansible checkout run:
 ```sh
diff --git a/README_origin.md b/README_origin.md
index 12e79791e..0387e213f 100644
--- a/README_origin.md
+++ b/README_origin.md
@@ -59,12 +59,12 @@ option to ansible-playbook.
 # This is an example of a bring your own (byo) host inventory
 
 # Create an OSEv3 group that contains the masters and nodes groups
-[OSv3:children]
+[OSEv3:children]
 masters
 nodes
 
 # Set variables common for all OSEv3 hosts
-[OSv3:vars]
+[OSEv3:vars]
 
 # SSH user, this user should allow ssh based auth without requiring a password
 ansible_ssh_user=root
@@ -95,6 +95,8 @@ osv3-lb.example.com
 The hostnames above should resolve both from the hosts themselves and
 the host where ansible is running (if different).
 
+A more complete example inventory file ([hosts.origin.example](https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.origin.example)) is available under the [`/inventory/byo`](https://github.com/openshift/openshift-ansible/tree/master/inventory/byo) directory.
+
 ## Running the ansible playbooks
 From the openshift-ansible checkout run:
 ```sh
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 59650bba9..2678ffd56 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -5,7 +5,7 @@
 }
 
 Name:           openshift-ansible
-Version:        3.0.21
+Version:        3.0.22
 Release:        1%{?dist}
 Summary:        Openshift and Atomic Enterprise Ansible
 License:        ASL 2.0
@@ -259,6 +259,13 @@ Atomic OpenShift Utilities includes
 
 
 %changelog
+* Wed Jan 06 2016 Kenny Woodson <kwoodson@redhat.com> 3.0.22-1
+- playbook for restarting SDN (jdiaz@redhat.com)
+- Stop haproxy and remove package during uninstall. (abutcher@redhat.com)
+- Group name as per hosts.origin.example (donovan.muller@gmail.com)
+- I believe the ami id changed since the initial documentation was created for
+  AWS deployment (rcook@redhat.com)
+
 * Tue Jan 05 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.21-1
 - Fix osm_controller_args and osm_api_server_args settings.
   (abutcher@redhat.com)
diff --git a/playbooks/adhoc/sdn_restart/oo-sdn-restart.yml b/playbooks/adhoc/sdn_restart/oo-sdn-restart.yml
new file mode 100755
index 000000000..0dc021fbc
--- /dev/null
+++ b/playbooks/adhoc/sdn_restart/oo-sdn-restart.yml
@@ -0,0 +1,53 @@
+#!/usr/bin/ansible-playbook
+---
+#example run:
+# ansible-playbook -e "host=ops-node-compute-abcde" oo-sdn-restart.yml
+#
+
+- name: Check vars
+  hosts: localhost
+  gather_facts: false
+ 
+  pre_tasks:
+  - fail:
+      msg: "Playbook requires host to be set"
+    when: host is not defined or host == ''
+
+- name: Restart openshift/docker (and monitoring containers)
+  hosts: oo_version_3:&oo_name_{{ host }}
+  gather_facts: false
+  user: root
+
+  tasks:
+  - name: stop openshift/docker
+    service:
+      name: "{{ item }}"
+      state: stopped
+    with_items:
+    - atomic-openshift-node
+    - docker
+
+  - name: restart openvswitch
+    service:
+      name: openvswitch
+      state: restarted
+
+  - name: wait 5 sec
+    pause:
+      seconds: 5
+
+  - name: start openshift/docker
+    service:
+      name: "{{ item }}"
+      state: started
+    with_items:
+    - atomic-openshift-node
+    - docker
+
+  - name: start monitoring containers
+    service:
+      name: "{{ item }}"
+      state: restarted
+    with_items:
+    - oso-f22-host-monitoring
+    - oso-rhel7-zagg-client
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index 55df78a3f..ac20f5f9b 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -40,6 +40,7 @@
         - atomic-openshift-master-controllers
         - atomic-openshift-node
         - etcd
+        - haproxy
         - openshift-master
         - openshift-master-api
         - openshift-master-controllers
@@ -67,6 +68,7 @@
         - atomic-openshift-sdn-ovs
         - corosync
         - etcd
+        - haproxy
         - openshift
         - openshift-master
         - openshift-node