From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 12 Aug 2016 15:31:01 +0000 (-0400)
Subject: ceph-common: convert ceph_stable_rh_storage to ceph_rhcs in prerequisites for iso... 
X-Git-Tag: v1.0.6~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F934%2Fhead;p=ceph-ansible.git

ceph-common: convert ceph_stable_rh_storage to ceph_rhcs in prerequisites for iso install

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: issue#811
---

diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml b/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml
index c376e6b56..e589fec34 100644
--- a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml
+++ b/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml
@@ -4,40 +4,40 @@
     path: "{{ item }}"
     state: directory
   with_items:
-    - "{{ ceph_stable_rh_storage_mount_path }}"
-    - "{{ ceph_stable_rh_storage_repository_path }}"
+    - "{{ ceph_rhcs_mount_path }}"
+    - "{{ ceph_rhcs_repository_path }}"
 
 - name: ensure destination iso directory exists
   file:
-    path: "{{ ceph_stable_rh_storage_iso_path | dirname }}"
+    path: "{{ ceph_rhcs_iso_path | dirname }}"
     state: directory
     recurse: yes
-  when: "'{{ ceph_stable_rh_storage_iso_path | dirname }}' != '/'"
+  when: "'{{ ceph_rhcs_iso_path | dirname }}' != '/'"
 
 - name: fetch the red hat storage iso from the ansible server
   copy:
-    src: "{{ ceph_stable_rh_storage_iso_path }}"
-    dest: "{{ ceph_stable_rh_storage_iso_path }}"
+    src: "{{ ceph_rhcs_iso_path }}"
+    dest: "{{ ceph_rhcs_iso_path }}"
 
-# assumption: ceph_stable_rh_storage_mount_path does not specify directory
+# assumption: ceph_rhcs_mount_path does not specify directory
 
 - name: mount red hat storage iso file
   mount:
-    name: "{{ ceph_stable_rh_storage_mount_path }}"
-    src: "{{ ceph_stable_rh_storage_iso_path }}"
+    name: "{{ ceph_rhcs_mount_path }}"
+    src: "{{ ceph_rhcs_iso_path }}"
     fstype: iso9660
     opts: ro,loop,noauto
     passno: 2
     state: mounted
 
 - name: copy red hat storage iso content
-  shell: cp -r {{ ceph_stable_rh_storage_mount_path }}/* {{ ceph_stable_rh_storage_repository_path }}
+  shell: cp -r {{ ceph_rhcs_mount_path }}/* {{ ceph_rhcs_repository_path }}
   args:
-    creates: "{{ ceph_stable_rh_storage_repository_path }}/README"
+    creates: "{{ ceph_rhcs_repository_path }}/README"
 
 - name: unmount red hat storage iso file
   mount:
-    name: "{{ ceph_stable_rh_storage_mount_path }}"
-    src: "{{ ceph_stable_rh_storage_iso_path }}"
+    name: "{{ ceph_rhcs_mount_path }}"
+    src: "{{ ceph_rhcs_iso_path }}"
     fstype: iso9660
     state: unmounted