aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-12 18:06:28 +0000
committerGerrit Code Review <review@openstack.org>2015-08-12 18:06:28 +0000
commit59ab99ea1f0f0e6c715d76a91350f811edf128fd (patch)
tree7faafa809d0fca06ac967daf84ef1c0c8739bbcd /etc
parent7c37d309f94c54cdc1d7904ab28b1f18a32678c0 (diff)
parent18f0e536f696882b4285fc3b9e9a42a8eccd5b8e (diff)
downloadkolla-59ab99ea1f0f0e6c715d76a91350f811edf128fd.tar.gz
kolla-59ab99ea1f0f0e6c715d76a91350f811edf128fd.zip
Merge "Add ansible support for Cinder"
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/config/cinder.conf0
-rw-r--r--etc/kolla/config/cinder/cinder-api.conf0
-rw-r--r--etc/kolla/config/cinder/cinder-backup.conf0
-rw-r--r--etc/kolla/config/cinder/cinder-scheduler.conf0
-rw-r--r--etc/kolla/config/cinder/cinder-volume.conf0
-rw-r--r--etc/kolla/defaults.yml1
-rw-r--r--etc/kolla/globals.yml7
-rw-r--r--etc/kolla/passwords.yml3
8 files changed, 11 insertions, 0 deletions
diff --git a/etc/kolla/config/cinder.conf b/etc/kolla/config/cinder.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/cinder.conf
diff --git a/etc/kolla/config/cinder/cinder-api.conf b/etc/kolla/config/cinder/cinder-api.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/cinder/cinder-api.conf
diff --git a/etc/kolla/config/cinder/cinder-backup.conf b/etc/kolla/config/cinder/cinder-backup.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/cinder/cinder-backup.conf
diff --git a/etc/kolla/config/cinder/cinder-scheduler.conf b/etc/kolla/config/cinder/cinder-scheduler.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/cinder/cinder-scheduler.conf
diff --git a/etc/kolla/config/cinder/cinder-volume.conf b/etc/kolla/config/cinder/cinder-volume.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/cinder/cinder-volume.conf
diff --git a/etc/kolla/defaults.yml b/etc/kolla/defaults.yml
index 5ed397cbf..ad04c8617 100644
--- a/etc/kolla/defaults.yml
+++ b/etc/kolla/defaults.yml
@@ -33,6 +33,7 @@ nova_api_port: "8774"
neutron_server_port: "9696"
+cinder_api_port: "8776"
# These roles are required for Kolla to be operation, however a savvy deployer
# could disable some of these required roles and run thier own services.
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 4d5fb7c9b..565201648 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -93,3 +93,10 @@ openstack_auth_v2:
# RabbitMQ options
####################
rabbitmq_user: "openstack"
+
+
+#################################
+## Cinder - Block Storage options
+#################################
+enable_cinder: "no"
+cinder_volume_driver: "lvm"
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 754f112a6..cfe3c08cb 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -33,6 +33,9 @@ neutron_keystone_password: "password"
metadata_secret: "password"
+cinder_database_password: "password"
+cinder_keystone_password: "password"
+
####################
# RabbitMQ options
####################