diff --git a/neutron-controller.yml b/neutron-controller.yml index 8ce60b7..cf03466 100644 --- a/neutron-controller.yml +++ b/neutron-controller.yml @@ -5,5 +5,7 @@ - hosts: neutron-controller become: True + vars_files: + - settings.yml roles: - - neutron-controller + - neutron-controller diff --git a/nova-compute.yml b/nova-compute.yml index 69487e2..088f9e8 100644 --- a/nova-compute.yml +++ b/nova-compute.yml @@ -5,5 +5,7 @@ - hosts: nova-compute become: True + vars_files: + - settings.yml roles: - - nova-compute + - nova-compute diff --git a/roles/neutron-controller/tasks/main.yml b/roles/neutron-controller/tasks/main.yml index b14e101..a269e92 100644 --- a/roles/neutron-controller/tasks/main.yml +++ b/roles/neutron-controller/tasks/main.yml @@ -16,6 +16,7 @@ - set_fact: env_vars: > + -e "GLOBAL_PHYSNET_MTU={{ global_physnet_mtu }}" -e "KEYSTONE_HOST={{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}" -e "MEMCACHED_HOST={{ listen_ip | default(hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address']) }}" -e "METADATA_SECRET={{ secrets['METADATA_SECRET'] }}" diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service index 7ae08b9..40555a1 100644 --- a/roles/nova-compute/templates/nova-compute.service +++ b/roles/nova-compute/templates/nova-compute.service @@ -10,6 +10,8 @@ ExecStartPre=-/usr/bin/docker kill %n ExecStartPre=-/usr/bin/docker rm %n ExecStart=/usr/bin/docker run --name %n \ -e "GLANCE_CONTROLLER_HOST={{ hostvars[groups['glance-controller'][0]]['listen_ip'] | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}" \ + -e "GLOBAL_PHYSNET_MTU={{ global_physnet_mtu }}" \ + -e "GLOBAL_PHYSNET_MTU={{ global_physnet_mtu }}" \ -e "KEYSTONE_HOST={{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}" \ -e "METADATA_SECRET={{ secrets['METADATA_SECRET'] }}" \ -e "MEMCACHED_HOST={{ hostvars[groups['memcached'][0]]['listen_ip'] | default(hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address']) }}" \