diff --git a/backup_restore/README.md b/backup_restore/README.md
index 6c3c93b..1cea8cc 100644
--- a/backup_restore/README.md
+++ b/backup_restore/README.md
@@ -14,3 +14,5 @@ Script / Playbook Name | Description | Notes
 `ocp-project-backup.sh` | Creates a yaml backup of all projects in the OpenShift cluster. | Must be run on an OCP master node.
 `ocp-etcd3-pods-backup.sh` | Creates a backup of the etcd (data snapshot & config). Also manages backup retention. | Must be run on the OCP nodes running the etcd static Pods (usually masters).
 `master-backup.yaml` | Ansible clone of the bash `ocp-master-cert-backup.sh` script.
+`ocp_backup.yml` | Backup masters and nodes using the Day-2 Guide | Run from a control host
+`./roles` | Roles use in the `ocp_backup.yml` playbook
diff --git a/backup_restore/ocp_backup.yml b/backup_restore/ocp_backup.yml
new file mode 100644
index 0000000..d0a89f8
--- /dev/null
+++ b/backup_restore/ocp_backup.yml
@@ -0,0 +1,66 @@
+----
+# This playbook and the roles follows OCP Day-2 Operation Guide
+# Tested on OCP 3.10
+# Commented out - The last tasks send backed up files to S3 bucket
+# Run this playbook from a control host:
+# $ ansible-playbook -i inventory ocp_backup.yml
+#
+- name: backup master hosts
+  hosts: masters
+  roles:
+  - ocp_backup_etcd
+  - ocp_backup_masters
+  - ocp_backup_compress_backup
+
+- name: ocp backup of node hosts
+  hosts: nodes,!masters
+  roles:
+  - ocp_backup_nodes
+  - ocp_backup_compress_backup
+
+- name: Set up directory for fetching tar files
+  hosts: localhost
+  connection: local
+  tasks:
+    - name: Create local temp directory for fetching files 
+      file:
+        path: "/tmp/ocp_backup_{{ ansible_date_time.date }}"
+        state: directory
+      register: local_dir
+  
+- name: fetch tar files from all hosts
+  hosts: OSEv3
+  tasks:
+    - name: fetch tar files
+      fetch:
+        src: "/root/ocp_backup/{{ inventory_hostname }}.tar.gz"
+        dest: "{{ hostvars['localhost'].local_dir.path }}/"
+        flat: yes
+
+    - name: remove compressed file from remote dir
+      file:
+        path: "/root/ocp_backup"
+        state: absent
+
+### NOTES ####
+# To enable sync to s3, need the following:
+# yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+# yum -y install python-pip python-wheel
+# pip install boto3
+### END NOTES ####
+### Send to S3 ####
+#- name: prepare files and send backup to S3
+#  hosts: localhost
+#  connection: local
+#  tasks:
+#    - name: sync files to S3
+#      s3_sync:
+#        bucket: my-s3-bucket
+#        key_prefix: "ocp_backup_{{ ansible_date_time.date }}"
+#        file_root: "{{ hostvars['localhost'].local_dir.path }}/"
+#
+#    - name: remove temp files
+#      file:
+#        path: "{{ hostvars['localhost'].local_dir.path }}"
+#        state: absent
+### Send to S3 END ###
diff --git a/backup_restore/roles/ocp_backup_compress_backup/README.md b/backup_restore/roles/ocp_backup_compress_backup/README.md
new file mode 100644
index 0000000..12cad54
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/README.md
@@ -0,0 +1,40 @@
+Role Name
+=========
+
+Simple task to compress backed up files and directories
+
+Reference doc:
+
+https://docs.openshift.com/container-platform/3.10/day_two_guide/environment_backup.html#backing-up-node_environment-backup
+
+
+Requirements
+------------
+
+
+Role Variables
+--------------
+
+
+Dependencies
+------------
+
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/backup_restore/roles/ocp_backup_compress_backup/defaults/main.yml b/backup_restore/roles/ocp_backup_compress_backup/defaults/main.yml
new file mode 100644
index 0000000..fbefaff
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# defaults file for ocp_backup_compress_backup
+
diff --git a/backup_restore/roles/ocp_backup_compress_backup/handlers/main.yml b/backup_restore/roles/ocp_backup_compress_backup/handlers/main.yml
new file mode 100644
index 0000000..c36c175
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for ocp_backup_compress_backup
diff --git a/backup_restore/roles/ocp_backup_compress_backup/meta/main.yml b/backup_restore/roles/ocp_backup_compress_backup/meta/main.yml
new file mode 100644
index 0000000..7223799
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/meta/main.yml
@@ -0,0 +1,57 @@
+galaxy_info:
+  author: your name
+  description: your description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_compress_backup/tasks/main.yml b/backup_restore/roles/ocp_backup_compress_backup/tasks/main.yml
new file mode 100644
index 0000000..b0f914a
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+# Compress backup
+- name: compress backup directory
+  archive:
+    path: "{{ MYBACKUPDIR }}"
+    dest: "{{ MYBACKUPDIR }}.tar.gz"
+    format: gz
+    remove: no
+
+- name: manually remove data files
+  shell: rm -rf {{ MYBACKUPDIR }}/
diff --git a/backup_restore/roles/ocp_backup_compress_backup/tests/inventory b/backup_restore/roles/ocp_backup_compress_backup/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/backup_restore/roles/ocp_backup_compress_backup/tests/test.yml b/backup_restore/roles/ocp_backup_compress_backup/tests/test.yml
new file mode 100644
index 0000000..9c19319
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ocp_backup_compress_backup
diff --git a/backup_restore/roles/ocp_backup_compress_backup/vars/main.yml b/backup_restore/roles/ocp_backup_compress_backup/vars/main.yml
new file mode 100644
index 0000000..e255ef1
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_compress_backup/vars/main.yml
@@ -0,0 +1,4 @@
+---
+# vars file for ocp_backup_compress_backup
+MYBACKUPDIR: "/root/ocp_backup/{{ inventory_hostname }}"
+
diff --git a/backup_restore/roles/ocp_backup_etcd/README.md b/backup_restore/roles/ocp_backup_etcd/README.md
new file mode 100644
index 0000000..e48fec8
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/README.md
@@ -0,0 +1,48 @@
+Role Name
+=========
+
+Backup etcd v3 data and config, of static Pods.
+
+Refererence doc: https://docs.openshift.com/container-platform/3.10/day_two_guide/environment_backup.html#etcd-backup_environment-backup
+
+Documentation notes on restoring etcd:
+
+```
+The etcdctl backup command rewrites some of the metadata contained in
+the backup,specifically, the node ID and cluster ID, which means that in
+the backup,the node loses its former identity. To recreate a cluster from
+the backup, you create a new, single-node cluster, then add the rest of
+the nodes to the cluster. The metadata is rewritten to prevent
+the new node from joining an existing cluster.
+```
+
+Requirements
+------------
+
+
+Role Variables
+--------------
+
+
+Dependencies
+------------
+
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/backup_restore/roles/ocp_backup_etcd/defaults/main.yml b/backup_restore/roles/ocp_backup_etcd/defaults/main.yml
new file mode 100644
index 0000000..b16798a
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for ocp_backup_etcd
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_etcd/handlers/main.yml b/backup_restore/roles/ocp_backup_etcd/handlers/main.yml
new file mode 100644
index 0000000..b125334
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for ocp_backup_etcd
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_etcd/meta/main.yml b/backup_restore/roles/ocp_backup_etcd/meta/main.yml
new file mode 100644
index 0000000..7223799
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/meta/main.yml
@@ -0,0 +1,57 @@
+galaxy_info:
+  author: your name
+  description: your description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_etcd/tasks/main.yml b/backup_restore/roles/ocp_backup_etcd/tasks/main.yml
new file mode 100644
index 0000000..261aafd
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/tasks/main.yml
@@ -0,0 +1,8 @@
+---
+# tasks file for ocp_backup_etcd
+- name: pre_check tasks
+  import_tasks: pre_check.yml
+
+- name: save etcd data
+  import_tasks: save_etcd.yml
+
diff --git a/backup_restore/roles/ocp_backup_etcd/tasks/pre_check.yml b/backup_restore/roles/ocp_backup_etcd/tasks/pre_check.yml
new file mode 100644
index 0000000..1a51ddd
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/tasks/pre_check.yml
@@ -0,0 +1,28 @@
+---
+- name: backup directory {{ MYBACKUPDIR }} exist
+  file: 
+    name: "{{ MYBACKUPDIR }}"
+    state: directory
+
+- name: check for {{ MASTER_EXEC }} command
+  stat: 
+    path: "{{ MASTER_EXEC }}"
+  register: master_exec
+  failed_when: master_exec.stat.exists == False
+
+- name: check for {{ ETCD_POD_MANIFEST }}
+  stat:
+    path: "{{ ETCD_POD_MANIFEST }}"
+  register: etcd_pod_manifest
+  failed_when: etcd_pod_manifest.stat.exists == False
+
+- name: check {{ MYBACKUPDIR }} destination
+  shell: df -h {{ MYBACKUPDIR }} | grep -v 'Filesystem' | awk '{ print $5}' | cut -d '%' -f 1
+  register: shell_result
+  changed_when: false
+
+- name: fail with custom message
+  fail:
+    msg: "{{ MYBACKUPDIR }} is almost full"
+  when: shell_result.stdout|int > 90
+
diff --git a/backup_restore/roles/ocp_backup_etcd/tasks/save_etcd.yml b/backup_restore/roles/ocp_backup_etcd/tasks/save_etcd.yml
new file mode 100644
index 0000000..ff78ec5
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/tasks/save_etcd.yml
@@ -0,0 +1,26 @@
+---
+# Save etcd configuration
+- name: backup dir {{ MYBACKUPDIR }}/etcd-config exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etcd-config"
+    state: directory
+
+- name: save etcd configuration
+  shell: cp -aR /etc/etcd/ {{ MYBACKUPDIR }}/etcd-config/
+
+- name: get etcd endpoint
+  shell: grep https {{ ETCD_POD_MANIFEST }} | cut -d '/' -f3
+  register: etcd_ep
+
+- name: etcd data - save snapshot
+  shell: "{{ MASTER_EXEC }} etcd etcd /bin/bash -c \"ETCDCTL_API=3 /usr/bin/etcdctl --cert /etc/etcd/peer.crt --key /etc/etcd/peer.key --cacert /etc/etcd/ca.crt --endpoints {{ etcd_ep.stdout }} snapshot save /var/lib/etcd/snapshot.db\""
+
+- name: etcd data - check snapshot status
+  shell: "{{ MASTER_EXEC }} etcd etcd /bin/bash -c \"ETCDCTL_API=3 /usr/bin/etcdctl --cert /etc/etcd/peer.crt --key /etc/etcd/peer.key --cacert /etc/etcd/ca.crt --endpoints {{ etcd_ep.stdout }} snapshot status /var/lib/etcd/snapshot.db\""
+  register: status_result
+  failed_when: status_result.rc != 0
+
+- name: move snapshot to {{ MYBACKUPDIR }}/etcd-config
+  command: mv /var/lib/etcd/snapshot.db {{ MYBACKUPDIR }}/etcd-config/snapshot.db
+
+
diff --git a/backup_restore/roles/ocp_backup_etcd/tests/inventory b/backup_restore/roles/ocp_backup_etcd/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/backup_restore/roles/ocp_backup_etcd/tests/test.yml b/backup_restore/roles/ocp_backup_etcd/tests/test.yml
new file mode 100644
index 0000000..8e4bd66
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ocp_backup_etcd
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_etcd/vars/main.yml b/backup_restore/roles/ocp_backup_etcd/vars/main.yml
new file mode 100644
index 0000000..952e6a6
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_etcd/vars/main.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ocp_backup_etcd
+MYBACKUPDIR: "/root/ocp_backup/{{ inventory_hostname }}"
+MASTER_EXEC: "/usr/local/bin/master-exec"
+ETCD_CONFIG_DIR: "/etc/etcd"
+ETCD_POD_MANIFEST: "/etc/origin/node/pods/etcd.yaml"
+
diff --git a/backup_restore/roles/ocp_backup_masters/README.md b/backup_restore/roles/ocp_backup_masters/README.md
new file mode 100644
index 0000000..be69d01
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/README.md
@@ -0,0 +1,40 @@
+Role Name
+=========
+
+Creating a master host backup
+
+Reference documentation:
+
+https://docs.openshift.com/container-platform/3.10/day_two_guide/environment_backup.html#creating-master-backup_environment-backup
+
+
+Requirements
+------------
+
+
+Role Variables
+--------------
+
+
+Dependencies
+------------
+
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/backup_restore/roles/ocp_backup_masters/defaults/main.yml b/backup_restore/roles/ocp_backup_masters/defaults/main.yml
new file mode 100644
index 0000000..79c6062
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for ocp_backup_masters
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_masters/handlers/main.yml b/backup_restore/roles/ocp_backup_masters/handlers/main.yml
new file mode 100644
index 0000000..4300e57
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for ocp_backup_masters
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_masters/meta/main.yml b/backup_restore/roles/ocp_backup_masters/meta/main.yml
new file mode 100644
index 0000000..7223799
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/meta/main.yml
@@ -0,0 +1,57 @@
+galaxy_info:
+  author: your name
+  description: your description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_masters/tasks/installed_pkgs_list.yml b/backup_restore/roles/ocp_backup_masters/tasks/installed_pkgs_list.yml
new file mode 100644
index 0000000..d5b142a
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/tasks/installed_pkgs_list.yml
@@ -0,0 +1,25 @@
+---
+# Save a list of installed packages and capture subscription information
+- name: backup directory {{ MYBACKUPDIR }}/rhsm exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etc/rhsm"
+    state: directory
+
+- name: save a list of installed packages
+  shell: rpm -qa | sort > {{ MYBACKUPDIR }}/installed_packages.txt
+
+- name: save rhsm.conf
+  shell: cp -a /etc/rhsm/rhsm.conf {{ MYBACKUPDIR }}/etc/rhsm/
+
+- name: subscription-manager command available
+  stat: 
+    path: /sbin/subscription-manager
+  register: is_subman
+
+- name: subscription-manager identity output
+  shell: /sbin/subscription-manager identity > {{ MYBACKUPDIR }}/subscription-identity.txt
+  when: is_subman.stat.exists == True
+
+- name: save list of subscribed repositories
+  shell: /sbin/subscription-manager repos --list-enabled | grep 'Repo ID:' | awk '{print $3}' > {{ MYBACKUPDIR }}/enabled-repositories.txt
+  when: is_subman.stat.exists == True
diff --git a/backup_restore/roles/ocp_backup_masters/tasks/main.yml b/backup_restore/roles/ocp_backup_masters/tasks/main.yml
new file mode 100644
index 0000000..4bc7bbb
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+# tasks file for ocp_backup_masters
+- name: save master config 
+  import_tasks: save_master_config.yml
+
+- name: save ocp files
+  import_tasks: save_ocp_files.yml
+
+- name: save installed pkgs list
+  import_tasks: installed_pkgs_list.yml
+
diff --git a/backup_restore/roles/ocp_backup_masters/tasks/save_master_config.yml b/backup_restore/roles/ocp_backup_masters/tasks/save_master_config.yml
new file mode 100644
index 0000000..e52afa7
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/tasks/save_master_config.yml
@@ -0,0 +1,18 @@
+---
+# Backup of the master host configuration files
+- name: backup directory {{ MYBACKUPDIR }}/etc/sysconfig exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etc/sysconfig"
+    state: directory
+
+- name: save /etc/origin
+  shell: cp -aR /etc/origin {{ MYBACKUPDIR }}/etc
+
+- name: save /etc/sysconfig
+  shell: cp -aR /etc/sysconfig/* {{ MYBACKUPDIR }}/etc/sysconfig/
+
+- name: remove symbolic links from backed up directories
+  shell: find {{ MYBACKUPDIR }}/etc/sysconfig -type l -exec rm -f {} \;
+
+- name: save registry certificates
+  shell: tar cf {{ MYBACKUPDIR }}/docker-registry-certs.tar /etc/docker/certs.d/*
diff --git a/backup_restore/roles/ocp_backup_masters/tasks/save_ocp_files.yml b/backup_restore/roles/ocp_backup_masters/tasks/save_ocp_files.yml
new file mode 100644
index 0000000..8f7151e
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/tasks/save_ocp_files.yml
@@ -0,0 +1,36 @@
+---
+# Backup of the master host configuration files
+- name: backup directory {{ MYBACKUPDIR }}/etc/sysconfig exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etc/pki/ca-trust/source/anchors"
+    state: directory
+
+- name: save /etc/origin
+  shell: cp -aR /etc/dnsmasq* {{ MYBACKUPDIR }}/etc
+
+- name: save /etc/sysconfig
+  shell: cp -aR /etc/sysconfig/{{ item }} {{ MYBACKUPDIR }}/etc/sysconfig/
+  with_items:
+    - iptables
+    - docker-*
+
+- name: save ca-trust certs
+  shell: cp -aR /etc/pki/ca-trust/source/anchors/* {{ MYBACKUPDIR }}/etc/pki/ca-trust/source/anchors/
+
+- name: check if flanneld exists
+  stat:
+    path: /etc/sysconfig/flanneld
+  register: is_flanneld
+
+- name: save flannel configururation file (if used)
+  shell: cp -a /etc/sysconfig/flanneld {{ MYBACKUPDIR }}/etc/sysconfig/
+  when: is_flanneld.stat.exists == True
+
+- name: check for /etc/cni
+  stat:
+    path: /etc/cni
+  register: is_cni
+
+- name: saving CNI config (if used)
+  shell: cp -aR /etc/cni {{ MYBACKUPDIR }}/etc/
+  when: is_cni.stat.isdir == True
diff --git a/backup_restore/roles/ocp_backup_masters/tests/inventory b/backup_restore/roles/ocp_backup_masters/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/backup_restore/roles/ocp_backup_masters/tests/test.yml b/backup_restore/roles/ocp_backup_masters/tests/test.yml
new file mode 100644
index 0000000..c4f8a9d
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ocp_backup_masters
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_masters/vars/main.yml b/backup_restore/roles/ocp_backup_masters/vars/main.yml
new file mode 100644
index 0000000..914bde4
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_masters/vars/main.yml
@@ -0,0 +1,4 @@
+---
+# vars file for ocp_backup_masters
+MYBACKUPDIR: "/root/ocp_backup/{{ inventory_hostname }}"
+
diff --git a/backup_restore/roles/ocp_backup_nodes/README.md b/backup_restore/roles/ocp_backup_nodes/README.md
new file mode 100644
index 0000000..83cb313
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/README.md
@@ -0,0 +1,40 @@
+Role Name
+=========
+
+Creating node host backup
+
+Reference doc:
+
+https://docs.openshift.com/container-platform/3.10/day_two_guide/environment_backup.html#backing-up-node_environment-backup
+
+
+Requirements
+------------
+
+
+Role Variables
+--------------
+
+
+Dependencies
+------------
+
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/backup_restore/roles/ocp_backup_nodes/defaults/main.yml b/backup_restore/roles/ocp_backup_nodes/defaults/main.yml
new file mode 100644
index 0000000..db583d2
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for ocp_backup_nodes
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_nodes/handlers/main.yml b/backup_restore/roles/ocp_backup_nodes/handlers/main.yml
new file mode 100644
index 0000000..e112883
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for ocp_backup_nodes
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_nodes/meta/main.yml b/backup_restore/roles/ocp_backup_nodes/meta/main.yml
new file mode 100644
index 0000000..7223799
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/meta/main.yml
@@ -0,0 +1,57 @@
+galaxy_info:
+  author: your name
+  description: your description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_nodes/tasks/compress_backup.yml b/backup_restore/roles/ocp_backup_nodes/tasks/compress_backup.yml
new file mode 100644
index 0000000..82e8a14
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tasks/compress_backup.yml
@@ -0,0 +1,9 @@
+---
+# Compress backup
+- name: compress backup directory
+  archive:
+    path: "{{ MYBACKUPDIR }}"
+    dest: "{{ MYBACKUPDIR }}.tar.gz"
+    format: gz
+    remove: yes
+
diff --git a/backup_restore/roles/ocp_backup_nodes/tasks/installed_pkgs_list.yml b/backup_restore/roles/ocp_backup_nodes/tasks/installed_pkgs_list.yml
new file mode 100644
index 0000000..d5b142a
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tasks/installed_pkgs_list.yml
@@ -0,0 +1,25 @@
+---
+# Save a list of installed packages and capture subscription information
+- name: backup directory {{ MYBACKUPDIR }}/rhsm exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etc/rhsm"
+    state: directory
+
+- name: save a list of installed packages
+  shell: rpm -qa | sort > {{ MYBACKUPDIR }}/installed_packages.txt
+
+- name: save rhsm.conf
+  shell: cp -a /etc/rhsm/rhsm.conf {{ MYBACKUPDIR }}/etc/rhsm/
+
+- name: subscription-manager command available
+  stat: 
+    path: /sbin/subscription-manager
+  register: is_subman
+
+- name: subscription-manager identity output
+  shell: /sbin/subscription-manager identity > {{ MYBACKUPDIR }}/subscription-identity.txt
+  when: is_subman.stat.exists == True
+
+- name: save list of subscribed repositories
+  shell: /sbin/subscription-manager repos --list-enabled | grep 'Repo ID:' | awk '{print $3}' > {{ MYBACKUPDIR }}/enabled-repositories.txt
+  when: is_subman.stat.exists == True
diff --git a/backup_restore/roles/ocp_backup_nodes/tasks/main.yml b/backup_restore/roles/ocp_backup_nodes/tasks/main.yml
new file mode 100644
index 0000000..55191b5
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+# tasks file for ocp_backup_nodes
+- name: save node config 
+  import_tasks: save_node_config.yml
+
+- name: save ocp files
+  import_tasks: save_ocp_files.yml
+
+- name: save installed pkgs list
+  import_tasks: installed_pkgs_list.yml
+
diff --git a/backup_restore/roles/ocp_backup_nodes/tasks/save_node_config.yml b/backup_restore/roles/ocp_backup_nodes/tasks/save_node_config.yml
new file mode 100644
index 0000000..c57a44f
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tasks/save_node_config.yml
@@ -0,0 +1,18 @@
+---
+# Backup of the node host configuration files
+- name: backup directory {{ MYBACKUPDIR }}/etc/sysconfig exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etc/sysconfig"
+    state: directory
+
+- name: save /etc/origin
+  shell: cp -aR /etc/origin {{ MYBACKUPDIR }}/etc
+
+- name: save /etc/sysconfig
+  shell: cp -aR /etc/sysconfig/* {{ MYBACKUPDIR }}/etc/sysconfig/
+
+- name: remove symbolic links from backed up directories
+  shell: find {{ MYBACKUPDIR }}/etc/sysconfig -type l -exec rm -f {} \;
+
+- name: save registry certificates
+  shell: tar cf {{ MYBACKUPDIR }}/docker-registry-certs.tar /etc/docker/certs.d/*
diff --git a/backup_restore/roles/ocp_backup_nodes/tasks/save_ocp_files.yml b/backup_restore/roles/ocp_backup_nodes/tasks/save_ocp_files.yml
new file mode 100644
index 0000000..19d7634
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tasks/save_ocp_files.yml
@@ -0,0 +1,36 @@
+---
+# Backup of the node host configuration files
+- name: backup directory {{ MYBACKUPDIR }}/etc/sysconfig exists
+  file:
+    path: "{{ MYBACKUPDIR }}/etc/pki/ca-trust/source/anchors"
+    state: directory
+
+- name: save /etc/origin
+  shell: cp -aR /etc/dnsmasq* {{ MYBACKUPDIR }}/etc
+
+- name: save /etc/sysconfig
+  shell: cp -aR /etc/sysconfig/{{ item }} {{ MYBACKUPDIR }}/etc/sysconfig/
+  with_items:
+    - iptables
+    - docker-*
+
+- name: save ca-trust certs
+  shell: cp -aR /etc/pki/ca-trust/source/anchors/* {{ MYBACKUPDIR }}/etc/pki/ca-trust/source/anchors/
+
+- name: check if flanneld exists
+  stat:
+    path: /etc/sysconfig/flanneld
+  register: is_flanneld
+
+- name: save flannel configururation file (if used)
+  shell: cp -a /etc/sysconfig/flanneld {{ MYBACKUPDIR }}/etc/sysconfig/
+  when: is_flanneld.stat.exists == True
+
+- name: check for /etc/cni
+  stat:
+    path: /etc/cni
+  register: is_cni
+
+- name: saving CNI config (if used)
+  shell: cp -aR /etc/cni {{ MYBACKUPDIR }}/etc/
+  when: is_cni.stat.isdir == True
diff --git a/backup_restore/roles/ocp_backup_nodes/tests/inventory b/backup_restore/roles/ocp_backup_nodes/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/backup_restore/roles/ocp_backup_nodes/tests/test.yml b/backup_restore/roles/ocp_backup_nodes/tests/test.yml
new file mode 100644
index 0000000..f842a14
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ocp_backup_nodes
\ No newline at end of file
diff --git a/backup_restore/roles/ocp_backup_nodes/vars/main.yml b/backup_restore/roles/ocp_backup_nodes/vars/main.yml
new file mode 100644
index 0000000..d0ff656
--- /dev/null
+++ b/backup_restore/roles/ocp_backup_nodes/vars/main.yml
@@ -0,0 +1,4 @@
+---
+# vars file for ocp_backup_nodes
+MYBACKUPDIR: "/root/ocp_backup/{{ inventory_hostname }}"
+