15 files changed, 87 insertions, 49 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 d75b3e2fe..17cb24d38 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -33,7 +33,11 @@ control
 control
 
 [telegraf:children]
+compute
+control
 monitoring
+network
+storage
 
 [elasticsearch:children]
 control
@@ -240,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 9580f6819..fa92b9044 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -51,7 +51,11 @@ monitoring
 control
 
 [telegraf:children]
+compute
+control
 monitoring
+network
+storage
 
 [elasticsearch:children]
 control
@@ -255,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/baremetal/tasks/install.yml b/ansible/roles/baremetal/tasks/install.yml
index f6ee106b1..7538ee100 100644
--- a/ansible/roles/baremetal/tasks/install.yml
+++ b/ansible/roles/baremetal/tasks/install.yml
@@ -4,6 +4,28 @@
   become: True
   when: ansible_os_family == 'Debian'
 
+- name: Set firewall default policy
+  ufw: state=disabled policy=allow
+  when: ansible_os_family == 'Debian'
+
+- name: Check if firewalld is installed
+  command: rpm -q firewalld
+  register: firewalld_check
+  failed_when: firewalld_check.rc > 1
+  when: ansible_os_family == 'RedHat'
+
+- name: Disable firewalld
+  become: True
+  service:
+    name: "{{ item }}"
+    enabled: false
+    state: stopped
+  with_items:
+    - firewalld
+  when:
+   - ansible_os_family == 'RedHat'
+   - firewalld_check.rc == 0
+
 - name: Install apt packages
   package: name={{item}} state=present
   become: True
diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml
index 55289180a..60205fe3e 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 }}"
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/kibana/tasks/start.yml b/ansible/roles/kibana/tasks/start.yml
index f58174804..239e892c2 100644
--- a/ansible/roles/kibana/tasks/start.yml
+++ b/ansible/roles/kibana/tasks/start.yml
@@ -8,3 +8,4 @@
     volumes:
       - "{{ node_config_directory }}/kibana/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
+      - "kolla_logs:/var/log/kolla/"
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index 7deb2b1e4..e567d3239 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -29,8 +29,8 @@ region_name = {{ openstack_region_name }}
 
 [keystone_auth]
 auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-user_domain_id = default
-project_domain_id = default
+user_domain_name = Default
+project_domain_name = Default
 project_name = service
 password = {{ magnum_keystone_password }}
 username = {{ magnum_keystone_user }}
@@ -41,8 +41,8 @@ auth_version = v3
 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
 auth_type = password
-project_domain_id = default
-user_domain_id = default
+project_domain_name = Default
+user_domain_name = Default
 project_name = service
 username = {{ magnum_keystone_user }}
 password = {{ magnum_keystone_password }}
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 }}
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index 9ed04e591..7aa1e0d67 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -1,4 +1,38 @@
 ---
+- name: Checking the api_interface is present
+  fail: "msg='Please check the api_interface property - interface {{ api_interface }} not found'"
+  when: api_interface not in ansible_interfaces
+
+- name: Checking the api_interface is active
+  fail: "msg='Please check the api_interface settings - interface {{ api_interface }} is not active'"
+  when: hostvars[inventory_hostname]['ansible_' + api_interface]['active'] != True
+
+- name: Checking the api_interface configuration
+  fail: "msg='Please check the api_interface settings - interface {{ api_interface }} configuration missing'"
+  when: hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4'] is not defined
+
+- name: Checking the api_interface ip address configuration
+  fail: "msg='Please check the api_interface settings - interface {{ api_interface }} ip address problem'"
+  when: hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] is not defined
+
+- name: Checking if kolla_internal_vip_address and kolla_external_vip_address are not pingable from any node
+  command: ping -c 3 {{ item }}
+  register: ping_output
+  changed_when: false
+  with_items:
+    - "{{ kolla_internal_vip_address }}"
+    - "{{ kolla_external_vip_address }}"
+  failed_when: ping_output.rc != 1
+  when: enable_haproxy | bool
+
+- name: Checking if kolla_internal_vip_address is in the same network as api_interface on all nodes
+  command: ip -4 -o addr show dev {{ api_interface }}
+  register: ip_addr_output
+  changed_when: false
+  failed_when: "'169.254.' not in kolla_internal_vip_address and \
+                kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none"
+  when: enable_haproxy | bool
+
 - name: Checking free port for Aodh API
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
@@ -895,37 +929,3 @@
   when:
     - inventory_hostname in groups['haproxy']
     - enable_searchlight | bool
-
-- name: Checking the network_interface is present
-  fail: "msg='Please check the network_interface property - interface {{ network_interface }} not found'"
-  when: network_interface not in ansible_interfaces
-
-- name: Checking the network_interface is active
-  fail: "msg='Please check the network_interface settings - interface {{ network_interface }} is not active'"
-  when: hostvars[inventory_hostname]['ansible_' + network_interface]['active'] != True
-
-- name: Checking the network_interface configuration
-  fail: "msg='Please check the network_interface settings - interface {{ network_interface }} configuration missing'"
-  when: hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4'] is not defined
-
-- name: Checking the network_interface ip address configuration
-  fail: "msg='Please check the network_interface settings - interface {{ network_interface }} ip address problem'"
-  when: hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] is not defined
-
-- name: Checking if kolla_internal_vip_address and kolla_external_vip_address are not pingable from any node
-  command: ping -c 3 {{ item }}
-  register: ping_output
-  changed_when: false
-  with_items:
-    - "{{ kolla_internal_vip_address }}"
-    - "{{ kolla_external_vip_address }}"
-  failed_when: ping_output.rc != 1
-  when: enable_haproxy | bool
-
-- name: Checking if kolla_internal_vip_address is in the same network as network_interface on all nodes
-  command: ip -4 -o addr show dev {{ network_interface }}
-  register: ip_addr_output
-  changed_when: false
-  failed_when: "'169.254.' not in kolla_internal_vip_address and \
-                kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none"
-  when: enable_haproxy | bool