From c0555cdcfa39ee2ddcc759fabd66db6c230ac5be Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Wed, 20 Jun 2018 16:01:30 +0200
Subject: [PATCH] Fixes for variable ceph use

---
 merlin                                           | 16 ++++++++--------
 .../nova-compute/templates/nova-compute.service  |  9 +++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/merlin b/merlin
index 6cff072..ede2fe7 100644
--- a/merlin
+++ b/merlin
@@ -30,7 +30,7 @@ merlin-managementnode001
 merlin-managementnode001
 
 [neutron-controller]
-merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.101 
+merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.101
 
 [heat]
 merlin-managementnode001
@@ -42,13 +42,13 @@ merlin-managementnode002
 merlin-managementnode002
 
 [cinder-storage]
-merlin-managementnode002 
-merlin-managementnode003 
-merlin-node001 
-merlin-node002 
-merlin-node003 
-merlin-node004 
-merlin-node005 
+merlin-managementnode002
+merlin-managementnode003
+merlin-node001
+merlin-node002
+merlin-node003
+merlin-node004
+merlin-node005
 
 [stor]
 merlin-stor00[1:8]
diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service
index 23ee429..a03fc84 100644
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -32,10 +32,11 @@ ExecStart=/usr/bin/docker run --name %n \
     -e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \
     -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" \
     -e "RABBIT_USER=openstack" \
-    -e "$MON_INITIAL_MEMBERS={{ ceph_mon_initial_members }} \
-    -e "$MON_HOST={{ ceph_mon_host }}" \
-    -e "$PUBLIC_NETWORK={{ ceph_public_network }}" \
-    -e "$OSD_POOL_DEFAULT_SIZE={{ ceph_osd_pool_default_size }}" \
+    -e "USE_CEPH={{ use_ceph }}" \
+    -e "MON_INITIAL_MEMBERS={{ ceph_mon_initial_members }}" \
+    -e "MON_HOST={{ ceph_mon_host }}" \
+    -e "PUBLIC_NETWORK={{ ceph_public_network }}" \
+    -e "OSD_POOL_DEFAULT_SIZE={{ ceph_osd_pool_default_size }}" \
     --add-host=keystone:{{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }} \
     --add-host=mariadb:{{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }} \
     --privileged \