diff options
| -rw-r--r-- | ansible/group_vars/all.yml | 9 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/glance/templates/glance-api.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/glance/templates/glance-api.json.j2 | 2 | ||||
| -rw-r--r-- | doc/external-ceph-guide.rst | 4 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 11 |
6 files changed, 20 insertions, 12 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index c5a6092f4..ed6b6c15f 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -225,8 +225,6 @@ nova_keystone_user: "nova" enable_nova_fake: "no" num_nova_fake_per_node: 5 -# Control usage of ceph per service -glance_enable_ceph: "{{ enable_ceph }}" #################### # RabbitMQ options @@ -249,6 +247,13 @@ kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" kibana_user: "kibana" +####################### +# Glance options +####################### +glance_backend_file: "{{ not enable_ceph | bool }}" +glance_backend_ceph: "{{ enable_ceph }}" + + ################################# # Cinder options ################################# diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml index 65df10888..0704c65bb 100644 --- a/ansible/roles/glance/tasks/deploy.yml +++ b/ansible/roles/glance/tasks/deploy.yml @@ -1,14 +1,14 @@ --- - include: ceph.yml when: - - (enable_ceph | bool) and (glance_enable_ceph | bool) + - (enable_ceph | bool) and (glance_backend_ceph | bool) - inventory_hostname in groups['ceph-mon'] or inventory_hostname in groups['glance-api'] or inventory_hostname in groups['glance-registry'] - include: external_ceph.yml when: - - (enable_ceph | bool == False) and (glance_enable_ceph | bool) + - (enable_ceph | bool == False) and (glance_backend_ceph | bool) - inventory_hostname in groups['glance-api'] or inventory_hostname in groups['glance-registry'] diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index 6751161e8..0ed898cc6 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -41,7 +41,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi flavor = keystone [glance_store] -{% if enable_ceph | bool and glance_enable_ceph | bool %} +{% if enable_ceph | bool and glance_backend_ceph | bool %} default_store = rbd stores = rbd rbd_store_user = glance diff --git a/ansible/roles/glance/templates/glance-api.json.j2 b/ansible/roles/glance/templates/glance-api.json.j2 index 1afd6929f..2d3c4cc9f 100644 --- a/ansible/roles/glance/templates/glance-api.json.j2 +++ b/ansible/roles/glance/templates/glance-api.json.j2 @@ -6,7 +6,7 @@ "dest": "/etc/glance/glance-api.conf", "owner": "glance", "perm": "0600" - }{% if glance_enable_ceph | bool %}, + }{% if glance_backend_ceph | bool %}, { "source": "{{ container_config_directory }}/ceph.*", "dest": "/etc/ceph/", diff --git a/doc/external-ceph-guide.rst b/doc/external-ceph-guide.rst index 230919163..b560ab218 100644 --- a/doc/external-ceph-guide.rst +++ b/doc/external-ceph-guide.rst @@ -33,10 +33,10 @@ service in ``/etc/kolla/global.yml``: :: - glance_enable_ceph: "yes" + glance_backend_ceph: "yes" cinder_backend_ceph: "yes" -The combination of ``enable_ceph: "no"`` and ``<service>_enable_ceph: "yes"`` +The combination of ``enable_ceph: "no"`` and ``<service>_backend_ceph: "yes"`` triggers the activation of external ceph mechanism in Kolla. Configuring External Ceph diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 1b6f006cd..6b1b192a5 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -126,10 +126,6 @@ neutron_external_interface: "eth1" #enable_swift: "no" #enable_tempest: "no" -# Control usage of ceph per service. This allows to configure external ceph -# when ceph is not deployed by Kolla. -#glance_enable_ceph: "{{ enable_ceph }}" - ################### # Ceph options @@ -144,6 +140,13 @@ neutron_external_interface: "eth1" # Valid options are [ erasure, replicated ] #ceph_pool_type: "replicated" +####################### +# Glance options +####################### +# Configure image backend. +glance_backend_file: "yes" +#glance_backend_ceph: "no" + ####################### # Cinder options |