Resolved merge conflic

the-cloudkeeper-project · Dec 14, 2017 · fc5112d · fc5112d
2 parents 2b79733 + c46b6e0
commit fc5112d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cloudkeeper_os/config.py b/cloudkeeper_os/config.py
@@ -32,7 +32,11 @@
                     'are stored.'),
     cfg.StrOpt('tempdir',
                default='/tmp',
-               help='Directory where the images are downloaded')
+               help='Directory where the images are downloaded'),
+    cfg.StrOpt('image_visibility',
+               default='private',
+               choices=['public', 'private', 'shared', 'community'],
+               help='Visibility of images uploaded to OpenStack'),
 ]
 
 cfg.CONF.register_opts(DEFAULT_OPTS)

diff --git a/etc/cloudkeeper-os/cloudkeeper-os.conf.sample b/etc/cloudkeeper-os/cloudkeeper-os.conf.sample
@@ -14,6 +14,10 @@
 
 # Directory where the images are downloaded (string value)
 #tempdir = /tmp
+
+# Visibility of images uploaded to OpenStack (string value)
+# Allowed values: public, private, shared, community
+#image_visibility = private
 
 #
 # From oslo.log