Merge "Add initial config function and keystone support"

8 files changed, 126 insertions, 0 deletions

diff --git a/etc/kolla/config/database.conf b/etc/kolla/config/database.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/database.conf
diff --git a/etc/kolla/config/global.conf b/etc/kolla/config/global.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/global.conf
diff --git a/etc/kolla/config/keystone.conf b/etc/kolla/config/keystone.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/keystone.conf
diff --git a/etc/kolla/config/keystone/keystone.conf b/etc/kolla/config/keystone/keystone.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/keystone/keystone.conf
diff --git a/etc/kolla/config/messaging.conf b/etc/kolla/config/messaging.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/etc/kolla/config/messaging.conf
diff --git a/etc/kolla/defaults.yml b/etc/kolla/defaults.yml
new file mode 100644
index 000000000..3eda37397
--- /dev/null
+++ b/etc/kolla/defaults.yml
@@ -0,0 +1,20 @@
+---
+# The options in this file can be overridden in 'globals.yml', but typically
+# shouldn't be modified. A comment describing why the option exists should be
+# included before each option.
+
+# Ansible Docker module bug. This can be removed when Ansible 2.0 arrives
+# https://github.com/ansible/ansible-modules-core/issues/1227
+docker_api_version: "1.18"
+
+# TODO(SamYaple): remove references to these variables in Ansible
+kolla_directory: "/usr/share/kolla"
+koalla_directory: "/usr/share/kolla"
+
+# The "temp" files that are created before merge need to stay persistent due
+# to the fact that ansible will register a "change" if it has to create them
+# again. Persistent files allow for idempotency
+node_templates_directory: "/usr/share/kolla/templates"
+
+# The directory to store the config files on the destination node
+node_config_directory: "/opt/kolla/config"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
new file mode 100644
index 000000000..cf95ebd21
--- /dev/null
+++ b/etc/kolla/globals.yml
@@ -0,0 +1,77 @@
+---
+# Please specify all passwords/secrets in the "/etc/kolla/passwords.yml"
+
+###################
+# Kolla options
+###################
+config_strategy: "CONFIG_EXTERNAL_COPY_ONCE"
+
+kolla_base_distro: "centos"
+kolla_install_type: "rdo"
+
+# The Public address used to communicate with Openstack
+# This must be set, but it can be an private ip. It can also be the same as the
+# internal address.
+kolla_external_address: "openstack.example.com"
+kolla_internal_address: "10.10.10.254"
+
+
+####################
+# Database options
+####################
+database_address: "{{ keystone_internal_address }}"
+database_user: "root"
+
+
+####################
+# Docker options
+####################
+docker_registry:
+docker_namespace: "kollaglue"
+docker_registry_username:
+docker_insecure_registry: "False"
+
+# Valid options are [ missing, always ]
+docker_pull_policy: "always"
+
+# Valid options are [ no, on-failure, always ]
+docker_restart_policy: "always"
+
+# '0' means unlimited retries
+docker_restart_policy_retry: "10"
+
+### Example: Private repository with authentication
+#
+# docker_registry: "172.16.0.10:5000"
+# docker_namespace: "companyname"
+# docker_registry_username: "sam"
+# docker_registry_password: "correcthorsebatterystaple"
+# docker_insecure_registry: "False"
+
+
+####################
+# Networking options
+####################
+# The interface to use for various services types
+network_interface: "eth0"
+
+# These can be adjusted for even more customization
+api_interface: "{{ network_interface }}"
+storage_interface: "{{ network_interface }}"
+neutron_interface: "{{ network_interface }}"
+
+
+####################
+# Openstack options
+####################
+openstack_release: "latest"
+
+openstack_logging_verbose: "True"
+openstack_logging_debug: "False"
+
+
+####################
+# RabbitMQ options
+####################
+#placeholder
+
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
new file mode 100644
index 000000000..79fa6868c
--- /dev/null
+++ b/etc/kolla/passwords.yml
@@ -0,0 +1,29 @@
+---
+# TODO: SamYaple
+# This file should have generated values by default. Propose Ansible vault for
+# locking down the secrets properly.
+
+
+###################
+# Database options
+####################
+database_password: "password"
+
+
+####################
+# Docker options
+####################
+docker_registry_password:
+
+
+####################
+# Openstack options
+####################
+keystone_admin_token: "password"
+keystone_database_password: "password"
+
+
+####################
+# RabbitMQ options
+####################
+