Merge pull request #103 from stackhpc/ingress-images

Support custom ingress images

Author: priteau

roles/cephadm/README.md

@@ -39,6 +39,8 @@ All Ceph hosts must be in the `ceph` group.
     * `cephadm_enable_firewalld`: If enabled - firewalld will be installed and rules will be applied (default: false)
     * `cephadm_enable_monitoring`: If enabled - cephadm monitoring stack will be deployed i.e. prometheus/node-exporters/grafana (default: false)
     * `cephadm_image`: If set - cephadm will use this image
+    * `cephadm_haproxy_image`: If set - cephadm will use this image for HAProxy in the ingress service
+    * `cephadm_keepalived_image`: If set - cephadm will use this image for Keepalived in the ingress service
     * `cephadm_install_ceph_cli`: If enabled - ceph cli will be installed on the hosts (default: false)
     * `cephadm_ssh_public_key`: Location where ssh public key used by cephadm will be saved (default: /etc/ceph/cephadm.pub)
     * `cephadm_ssh_private_key`: Location where ssh private key used by cephadm will be saved (default: /etc/ceph/cephadm.id)

roles/cephadm/defaults/main.yml

@@ -8,8 +8,10 @@ cephadm_recreate: false
 # Packages
 cephadm_custom_repos: false
 cephadm_package_update: false
-# Image
+# Images
 cephadm_image: ""
+cephadm_haproxy_image: ""
+cephadm_keepalived_image: ""
 # Registry
 cephadm_registry_url: ""
 cephadm_registry_username: ""

roles/cephadm/tasks/bootstrap.yml

@@ -48,6 +48,20 @@
   become: true
   changed_when: true
 
+- name: Set HAProxy image
+  command:
+    cmd: "cephadm shell -- ceph config set mgr mgr/cephadm/container_image_haproxy {{ cephadm_haproxy_image }}"
+  when: cephadm_haproxy_image | length > 0
+  become: true
+  changed_when: true
+
+- name: Set Keepalived image
+  command:
+    cmd: "cephadm shell -- ceph config set mgr mgr/cephadm/container_image_keepalived {{ cephadm_keepalived_image }}"
+  when: cephadm_keepalived_image | length > 0
+  become: true
+  changed_when: true
+
 - name: Get cluster fsid
   command:
     cmd: "cephadm shell -- ceph fsid"