Merge "Move lots of global.yml options"

1 files changed, 85 insertions, 16 deletions

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 0d0100d8a..1c09a3383 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -1,7 +1,5 @@
 ---
-# 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.
+# The options in this file can be overridden in 'globals.yml'
 
 # Ansible Docker module bug. This can be removed when Ansible 2.0 arrives
 # https://github.com/ansible/ansible-modules-core/issues/1227
@@ -19,10 +17,57 @@ node_templates_directory: "/usr/share/kolla/templates"
 # The directory to store the config files on the destination node
 node_config_directory: "/opt/kolla/config"
 
-# All services have ports that need to be referenced on a global scale between
-# the different services. This prevents setting the ports in the defaults for
-# each role.
+###################
+# Kolla options
+###################
+# Valid options are [ CONFIG_EXTERNAL_COPY_ONCE, CONFIG_EXTERNAL_COPY_ALWAYS ]
+config_strategy: "CONFIG_EXTERNAL_COPY_ONCE"
 
+# Valid options are [ centos, fedora, oraclelinux, ubuntu ]
+kolla_base_distro: "centos"
+# Valid options are [ binary, source ]
+kolla_install_type: "binary"
+
+# Value set in the public_url endpoint in Keystone
+kolla_external_address: "{{ kolla_internal_address }}"
+
+
+####################
+# Database options
+####################
+database_address: "{{ kolla_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"
+
+
+####################
+# Networking options
+####################
+api_interface: "{{ network_interface }}"
+storage_interface: "{{ network_interface }}"
+tunnel_interface: "{{ network_interface }}"
+
+# Valid options are [ openvswitch, linuxbridge ]
+neutron_plugin_agent: "openvswitch"
+
+# The default ports used by each service.
 mariadb_port: "3306"
 mariadb_wsrep_port: "4567"
 mariadb_ist_port: "4568"
@@ -47,18 +92,17 @@ 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.
-enable_glance: "yes"
-enable_haproxy: "yes"
-enable_keystone: "yes"
-enable_mariadb: "yes"
-enable_neutron: "yes"
-enable_nova: "yes"
-enable_rabbitmq: "yes"
 
+####################
+# Openstack options
+####################
+openstack_release: "latest"
+openstack_logging_verbose: "True"
+openstack_logging_debug: "False"
+
+openstack_region_name: "RegionOne"
 
-# Openstack authentication strings. You should only need to adjust these if you
+# Openstack authentication string. You should only need to override these if you
 # are changing the admin tenant/project or user.
 openstack_auth:
     auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}"
@@ -73,3 +117,28 @@ openstack_auth_v2:
     username: "admin"
     password: "{{ keystone_admin_password }}"
     project_name: "admin"
+
+# 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.
+enable_glance: "yes"
+enable_haproxy: "yes"
+enable_keystone: "yes"
+enable_mariadb: "yes"
+enable_neutron: "yes"
+enable_nova: "yes"
+enable_rabbitmq: "yes"
+
+# Additional option OpenStack services are specified here
+enable_cinder: "no"
+
+
+####################
+# RabbitMQ options
+####################
+rabbitmq_user: "openstack"
+
+
+#################################
+# Cinder - Block Storage options
+#################################
+cinder_volume_driver: "lvm"