diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 3 | ||||
| -rw-r--r-- | ansible/inventory/all-in-one | 4 | ||||
| -rw-r--r-- | ansible/inventory/multinode | 4 | ||||
| -rw-r--r-- | ansible/library/kolla_docker.py | 2 | ||||
| -rw-r--r-- | ansible/roles/ceilometer/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron-logrotate-global.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/horizon/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/horizon/tasks/start.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/horizon/templates/local_settings.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/ml2_conf.ini.j2 | 2 |
11 files changed, 18 insertions, 11 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 24772f765..fdd278169 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -108,7 +108,7 @@ storage_interface: "{{ network_interface }}" cluster_interface: "{{ network_interface }}" tunnel_interface: "{{ network_interface }}" bifrost_network_interface: "{{ network_interface }}" - +tunnel_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }}" # Valid options are [ openvswitch, linuxbridge, sfc ] neutron_plugin_agent: "openvswitch" @@ -338,6 +338,7 @@ keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keyston keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3" keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}/v3" +# Valid options are [ uuid, fernet ] keystone_token_provider: "uuid" fernet_token_expiry: 86400 diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index f603b04c0..17cb24d38 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -244,10 +244,10 @@ manila manila [manila-share:children] -storage +network [manila-data:children] -storage +manila # Swift [swift-proxy-server:children] diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 6139dae8a..fa92b9044 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -259,10 +259,10 @@ manila manila [manila-share:children] -storage +network [manila-data:children] -storage +manila # Swift [swift-proxy-server:children] diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index 0f2bd44a2..28f752a2e 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -651,7 +651,7 @@ class DockerWorker(object): def generate_module(): argument_spec = dict( common_options=dict(required=False, type='dict', default=dict()), - action=dict(requried=True, type='str', choices=['compare_image', + action=dict(required=True, type='str', choices=['compare_image', 'create_volume', 'get_container_env', 'get_container_state', diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml index e3d015df6..da9d47014 100644 --- a/ansible/roles/ceilometer/defaults/main.yml +++ b/ansible/roles/ceilometer/defaults/main.yml @@ -7,7 +7,7 @@ project_name: "ceilometer" #################### ceilometer_database_name: "ceilometer" ceilometer_database_user: "ceilometer" -ceilometer_database_port: "{{ mondodb_port if ceilometer_database_type == 'mongodb' else database_port }}" +ceilometer_database_port: "{{ mongodb_port if ceilometer_database_type == 'mongodb' else database_port }}" ceilometer_database_mongodb_address: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ceilometer_database_port }}{% if not loop.last %},{% endif %}{% endfor %}" ceilometer_database_mysql_address: "{{ kolla_internal_fqdn }}:{{ ceilometer_database_port }}" diff --git a/ansible/roles/common/templates/cron-logrotate-global.conf.j2 b/ansible/roles/common/templates/cron-logrotate-global.conf.j2 index c21e3d1c0..d74f27c7f 100644 --- a/ansible/roles/common/templates/cron-logrotate-global.conf.j2 +++ b/ansible/roles/common/templates/cron-logrotate-global.conf.j2 @@ -14,7 +14,7 @@ missingok minsize 30M -maxsize 100M +size 100M su root kolla diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index 169bfd68b..2658e2fd3 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/ansible/roles/horizon/defaults/main.yml @@ -21,6 +21,8 @@ horizon_image_full: "{{ horizon_image }}:{{ horizon_tag }}" #################### openstack_horizon_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}'}" +horizon_logging_debug: "{{ openstack_logging_debug }}" + #################### # Horizon diff --git a/ansible/roles/horizon/tasks/start.yml b/ansible/roles/horizon/tasks/start.yml index e178b92a2..746cae568 100644 --- a/ansible/roles/horizon/tasks/start.yml +++ b/ansible/roles/horizon/tasks/start.yml @@ -5,6 +5,8 @@ common_options: "{{ docker_common_options }}" image: "{{ horizon_image_full }}" name: "horizon" + environment: + ENABLE_NEUTRON_LBAAS: "{{ 'yes' if enable_neutron_lbaas | bool else 'no' }}" volumes: - "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" diff --git a/ansible/roles/horizon/templates/local_settings.j2 b/ansible/roles/horizon/templates/local_settings.j2 index 891b19441..733e2ab42 100644 --- a/ansible/roles/horizon/templates/local_settings.j2 +++ b/ansible/roles/horizon/templates/local_settings.j2 @@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from openstack_dashboard import exceptions from openstack_dashboard.settings import HORIZON_CONFIG -DEBUG = False +DEBUG = {{ horizon_logging_debug }} TEMPLATE_DEBUG = DEBUG COMPRESS_OFFLINE = True diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index 6f73e98a0..ff33a241f 100644 --- a/ansible/roles/keystone/templates/keystone.conf.j2 +++ b/ansible/roles/keystone/templates/keystone.conf.j2 @@ -20,8 +20,10 @@ domain_specific_drivers_enabled = true domain_config_dir = /etc/keystone/domains {% endif %} -{% if keystone_token_provider == 'fernet' %} [token] +{% if keystone_token_provider == 'uuid' %} +provider = uuid +{% elif keystone_token_provider == 'fernet' %} provider = {{ keystone_token_provider }} expiration = {{ fernet_token_expiry }} diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index f304d023e..b689440e0 100644 --- a/ansible/roles/neutron/templates/ml2_conf.ini.j2 +++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2 @@ -69,4 +69,4 @@ physical_interface_mappings = physnet1:{{ neutron_external_interface }} [vxlan] l2_population = true {% endif %} -local_ip = {{ api_interface_address }} +local_ip = {{ tunnel_interface_address }} |