Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update readme, cirros image url and add it to tests #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update readme, cirros image url and add it to tests #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ Sample pillars
storage:
engine: file
images:
- name: "CirrOS 0.3.1"
- name: "CirrOS"
format: qcow2
file: cirros-0.3.1-x86_64-disk.img
source: http://cdn.download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
public: true
file: cirros-0.4.0-x86_64-disk.img
source: https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
visibility: true
audit:
enabled: false
api_limit_max: 100
Expand Down
9 changes: 9 additions & 0 deletions glance/server.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,27 @@ glance_services:
{%- if server.database.get('ssl',{}).get('enabled',False) %}
- file: mysql_ca_glance_server
{% endif %}
#{%- if grains.get('noservices') %}
#- onlyif: /bin/false
#{%- endif %}

glance_install_database:
cmd.run:
- name: glance-manage db_sync
- require:
- service: glance_services
#{%- if grains.get('noservices') %}
#- onlyif: /bin/false
#{%- endif %}

glance_load_metadatafs:
cmd.run:
- name: glance-manage db_load_metadefs
- require:
- cmd: glance_install_database
#{%- if grains.get('noservices') %}
#- onlyif: /bin/false
#{%- endif %}

{%- if server.get('image_cache', {}).get('enabled', False) %}
glance_cron_glance-cache-pruner:
Expand Down
12 changes: 12 additions & 0 deletions tests/pillar/single.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@ glance:
policy:
publicize_image: "role:admin"
add_member:
images:
- name: "CirrOS"
format: qcow2
file: cirros-0.4.0-x86_64-disk.img
source: https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
visibility: true
- name: "CirrOS4"
format: qcow2
file: cirros-0.4.0-x86_64-disk.img
source: https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
# TODO: for backward compatibility, test public option.
public: true