Added variables for ceph and nova compute

roles/nova-compute/tasks/main.yml

@@ -22,8 +22,8 @@
     state: directory
     mode: 0777
   with_items:
-      - /srv/nova-compute
-      - /srv/nova-compute/etc/ceph
+    - /srv/nova-compute
+    - /srv/nova-compute/etc/ceph
 
 - name: copy ceph-client configurationfile
   copy:
@@ -46,16 +46,22 @@
     group: root
   tags: systemd
 
+- name: set ceph client keyring
+  copy:
+    content: "{{ceph_client_keyring}}"
+    dest: /srv/nova-compute/etc/ceph
+  when: use_ceph
+
 - command: systemctl daemon-reload
   tags: systemd
 
 - apt:
     name: "{{ item }}"
   with_items:
-      - kvm
-      - libvirt0
-      - libvirt-bin
-      - qemu
+    - kvm
+    - libvirt0
+    - libvirt-bin
+    - qemu
 
 - name: make sure service is started
   systemd:

roles/nova-compute/templates/nova-compute.service

@@ -32,6 +32,10 @@ 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 }}" \
     --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 \