From 397c3fe4fd0a8133cb7c6669b488d31b0c24c4dc Mon Sep 17 00:00:00 2001
From: pprokop <piotr.prokop@intel.com>
Date: Wed, 29 Jun 2016 07:53:37 +0200
Subject: [PATCH] Fixing typos

---
 roles/ceph-mon/defaults/main.yml                     |  2 +-
 roles/ceph-mon/tasks/docker/start_docker_monitor.yml | 10 +++++-----
 roles/ceph-mon/templates/ceph-mon.service.j2         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index efb50083e..b8a496a96 100644
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -69,7 +69,7 @@ ceph_mon_docker_interface: eth0
 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
 ceph_mon_docker_username: ceph
 ceph_mon_docker_imagename: daemon
-ceph_osd_docker_tag: latest
+ceph_mon_docker_tag: latest
 ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
 ceph_docker_on_openstack: false
 mon_docker_privileged: false
diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
index 5f4f468ae..8e85db1ba 100644
--- a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
+++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@ -2,7 +2,7 @@
 - name: populate kv_store with default ceph.conf
   docker:
     name: populate-kv-store
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
     command: populate_kvstore
     net: host
     env:
@@ -18,7 +18,7 @@
 - name: populate kv_store with custom ceph.conf
   docker:
     name: populate-kv-store
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
     command: populate_kvstore
     net: host
     env:
@@ -37,7 +37,7 @@
   docker:
     name: populate-kv-store
     state: absent
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
   when: mon_containerized_deployment_with_kv
 
 # Use systemd to manage container on Atomic host and CoreOS
@@ -79,7 +79,7 @@
 
 - name: run the ceph monitor docker image
   docker:
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
     name: "{{ ansible_hostname }}"
     net: "host"
     state: "running"
@@ -93,7 +93,7 @@
 
 - name: run the ceph monitor docker image with kv
   docker:
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
     name: "{{ ansible_hostname }}"
     net: "host"
     state: "running"
diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 998133276..292089b7f 100644
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -25,7 +25,7 @@ ExecStart=/usr/bin/docker run --rm --name %i --net=host \
    -e MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }} \
    -e CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }} \
    -e MON_NAME={{ ansible_hostname }} \
-    {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}
+    {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s