7 files changed, 27 insertions, 11 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml b/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml
index e22547692..c8e3d4083 100644
--- a/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template-beta.yaml
+++ b/roles/openshift_examples/files/examples/v1.4/cfme-templates/cfme-template.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Template
 labels:
-  template: cloudforms-beta
+  template: cloudforms
 metadata:
-  name: cloudforms-beta
+  name: cloudforms
   annotations:
     description: "CloudForms appliance with persistent storage"
     tags: "instant-app,cloudforms,cfme"
@@ -48,7 +48,7 @@ objects:
     annotations:
       description: "Keeps track of changes in the CloudForms app image"
   spec:
-    dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-app
+    dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-app
 - apiVersion: v1
   kind: PersistentVolumeClaim
   metadata:
@@ -188,7 +188,7 @@ objects:
     annotations:
       description: "Keeps track of changes in the CloudForms memcached image"
   spec:
-    dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-memcached
+    dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-memcached
 - apiVersion: v1
   kind: "DeploymentConfig"
   metadata:
@@ -272,7 +272,7 @@ objects:
     annotations:
       description: "Keeps track of changes in the CloudForms postgresql image"
   spec:
-    dockerImageRepository: registry.access.redhat.com/cloudforms_beta/cfme-openshift-postgresql
+    dockerImageRepository: registry.access.redhat.com/cloudforms/cfme-openshift-postgresql
 - apiVersion: v1
   kind: "DeploymentConfig"
   metadata:
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index d5ed9c09d..23dcd0440 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -37,7 +37,7 @@
   when: ansible_os_family == "RedHat" and ansible_distribution != "Fedora"
         and openshift_deployment_type == 'origin'
         and not openshift.common.is_containerized | bool
-        and openshift_enable_origin_repo | default(true)
+        and openshift_enable_origin_repo | default(true) | bool
 
 - name: Configure origin yum repositories RHEL/CentOS
   copy:
@@ -47,4 +47,4 @@
   when: ansible_os_family == "RedHat" and ansible_distribution != "Fedora"
         and openshift_deployment_type == 'origin'
         and not openshift.common.is_containerized | bool
-        and openshift_enable_origin_repo | default(true)
+        and openshift_enable_origin_repo | default(true) | bool
diff --git a/roles/openshift_repos/templates/yum_repo.j2 b/roles/openshift_repos/templates/yum_repo.j2
index 2d9243545..0ec0045eb 100644
--- a/roles/openshift_repos/templates/yum_repo.j2
+++ b/roles/openshift_repos/templates/yum_repo.j2
@@ -2,9 +2,9 @@
 [{{ repo.id }}]
 name={{ repo.name | default(repo.id) }}
 baseurl={{ repo.baseurl }}
-{% set enable_repo = repo.enabled | default('1') %}
+{% set enable_repo = repo.enabled | default(1,True) %}
 enabled={{ 1 if ( enable_repo == 1 or enable_repo == True ) else 0 }}
-{% set enable_gpg_check = repo.gpgcheck | default('1') %}
+{% set enable_gpg_check = repo.gpgcheck | default(1,True) %}
 gpgcheck={{ 1 if ( enable_gpg_check == 1 or enable_gpg_check == True ) else 0 }}
 {% for key, value in repo.iteritems() %}
 {% if key not in ['id', 'name', 'baseurl', 'enabled', 'gpgcheck'] and value is defined %}
diff --git a/roles/openshift_storage_nfs_lvm/README.md b/roles/openshift_storage_nfs_lvm/README.md
index 8b8471745..cc674d3fd 100644
--- a/roles/openshift_storage_nfs_lvm/README.md
+++ b/roles/openshift_storage_nfs_lvm/README.md
@@ -48,6 +48,13 @@ osnl_volume_num_start: 3
 # How many volumes/partitions to build, with the size we stated.
 osnl_number_of_volumes: 2
 
+# osnl_volume_reclaim_policy
+# Volume reclaim policy of a PersistentVolume tells the cluster
+# what to do with the volume after it is released.
+#
+# Valid values are "Retain" or "Recycle" (default).
+osnl_volume_reclaim_policy: "Recycle"
+
 ```
 
 ## Dependencies
@@ -71,6 +78,7 @@ exported via NFS.  json files are created in /root.
           osnl_volume_size: 5
           osnl_volume_num_start: 3
           osnl_number_of_volumes: 2
+          osnl_volume_reclaim_policy: "Recycle"
 
 
 ## Full example
@@ -96,6 +104,7 @@ exported via NFS.  json files are created in /root.
           osnl_volume_size: 5
           osnl_volume_num_start: 3
           osnl_number_of_volumes: 2
+          osnl_volume_reclaim_policy: "Recycle"
 
 * Run the playbook:
     ```
diff --git a/roles/openshift_storage_nfs_lvm/defaults/main.yml b/roles/openshift_storage_nfs_lvm/defaults/main.yml
index f81cdc724..48352187c 100644
--- a/roles/openshift_storage_nfs_lvm/defaults/main.yml
+++ b/roles/openshift_storage_nfs_lvm/defaults/main.yml
@@ -8,3 +8,10 @@ osnl_mount_dir: /exports/openshift
 
 # Volume Group to use.
 osnl_volume_group: openshiftvg
+
+# Volume reclaim policy of a PersistentVolume tells the cluster
+# what to do with the volume after it is released.
+#
+# Valid values are "Retain" or "Recycle".
+# See https://docs.openshift.com/enterprise/3.0/architecture/additional_concepts/storage.html#pv-recycling-policy
+osnl_volume_reclaim_policy: "Recycle"
diff --git a/roles/openshift_storage_nfs_lvm/templates/nfs.json.j2 b/roles/openshift_storage_nfs_lvm/templates/nfs.json.j2
index 3c4d2f56c..19e150f7d 100644
--- a/roles/openshift_storage_nfs_lvm/templates/nfs.json.j2
+++ b/roles/openshift_storage_nfs_lvm/templates/nfs.json.j2
@@ -12,7 +12,7 @@
       "storage": "{{ osnl_volume_size }}Gi"
     },
     "accessModes": [ "ReadWriteOnce", "ReadWriteMany" ],
-    "persistentVolumeReclaimPolicy": "Recycle",
+    "persistentVolumeReclaimPolicy": "{{ osnl_volume_reclaim_policy }}",
     "nfs": {
       "Server": "{{ inventory_hostname }}",
       "Path": "{{ osnl_mount_dir }}/{{ item }}"
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 113aca0e1..ce6e54664 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -212,7 +212,7 @@ def write_host(host, role, inventory, schedulable=None):
     if installer_host in [host.connect_to, host.hostname, host.public_hostname]:
         facts += ' ansible_connection=local'
         if os.geteuid() != 0:
-            no_pwd_sudo = subprocess.call(['sudo', '-n', 'echo', 'openshift'])
+            no_pwd_sudo = subprocess.call(['sudo', '-n', 'echo', '-n'])
             if no_pwd_sudo == 1:
                 print('The atomic-openshift-installer requires sudo access without a password.')
                 sys.exit(1)