diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml index 16bce4ba3b..c262f36695 100644 --- a/ansible/roles/cinder/tasks/start.yml +++ b/ansible/roles/cinder/tasks/start.yml @@ -7,7 +7,7 @@ image: "{{ cinder_api_image_full }}" volumes: - "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['cinder-api'] - name: Starting cinder-backup container @@ -18,7 +18,7 @@ image: "{{ cinder_backup_image_full }}" volumes: - "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['cinder-backup'] - name: Starting cinder-scheduler container @@ -29,7 +29,7 @@ image: "{{ cinder_scheduler_image_full }}" volumes: - "{{ node_config_directory }}/cinder-scheduler/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['cinder-scheduler'] - name: Starting cinder-volume container @@ -43,5 +43,5 @@ - "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro" - "/dev/:/dev/" - "/run/:/run/" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['cinder-volume'] diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml index cb36fe2dbf..a66d77d0fa 100644 --- a/ansible/roles/common/tasks/start.yml +++ b/ansible/roles/common/tasks/start.yml @@ -8,8 +8,8 @@ privileged: True volumes: - "{{ node_config_directory }}/rsyslog/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev:/dev" - "rsyslog:/var/log" + - "/run/kolla/:/run/kolla/" - name: Starting kolla-toolbox container kolla_docker: @@ -24,4 +24,4 @@ volumes: - "/dev/:/dev/" - "/run/:/run/" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2 index fd5df492fe..4d9eaa588a 100644 --- a/ansible/roles/common/templates/rsyslog.conf.j2 +++ b/ansible/roles/common/templates/rsyslog.conf.j2 @@ -1,5 +1,6 @@ # provides support for local system logging $ModLoad imuxsock +$AddUnixListenSocket /run/kolla/log $ModLoad imklog $KLogPermitNonKernelFacility on diff --git a/ansible/roles/glance/tasks/start.yml b/ansible/roles/glance/tasks/start.yml index 51e6cb4a31..0edfd2db69 100644 --- a/ansible/roles/glance/tasks/start.yml +++ b/ansible/roles/glance/tasks/start.yml @@ -7,7 +7,7 @@ name: "glance_registry" volumes: - "{{ node_config_directory }}/glance-registry/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['glance-registry'] - name: Starting glance-api container @@ -18,6 +18,6 @@ name: "glance_api" volumes: - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" - "glance:/var/lib/glance/" when: inventory_hostname in groups['glance-api'] diff --git a/ansible/roles/heat/tasks/start.yml b/ansible/roles/heat/tasks/start.yml index 29571818e8..c22756f423 100644 --- a/ansible/roles/heat/tasks/start.yml +++ b/ansible/roles/heat/tasks/start.yml @@ -7,7 +7,7 @@ name: "heat_api" volumes: - "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['heat-api'] - name: Starting heat-api-cfn container @@ -18,7 +18,7 @@ name: "heat_api_cfn" volumes: - "{{ node_config_directory }}/heat-api-cfn/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['heat-api-cfn'] - name: Starting heat-engine container @@ -29,5 +29,5 @@ name: "heat_engine" volumes: - "{{ node_config_directory }}/heat-engine/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['heat-engine'] diff --git a/ansible/roles/keystone/tasks/start.yml b/ansible/roles/keystone/tasks/start.yml index c70f8e7231..012c4fb6e4 100644 --- a/ansible/roles/keystone/tasks/start.yml +++ b/ansible/roles/keystone/tasks/start.yml @@ -7,7 +7,7 @@ name: "keystone" volumes: - "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" - name: Wait for keystone startup wait_for: host={{ keystone_admin_address }} port={{ keystone_admin_port }} diff --git a/ansible/roles/magnum/tasks/start.yml b/ansible/roles/magnum/tasks/start.yml index e103321eb6..7984ffc045 100644 --- a/ansible/roles/magnum/tasks/start.yml +++ b/ansible/roles/magnum/tasks/start.yml @@ -7,7 +7,7 @@ name: "magnum_api" volumes: - "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['magnum-api'] - name: Starting magnum-conductor container @@ -18,5 +18,5 @@ name: "magnum_conductor" volumes: - "{{ node_config_directory }}/magnum-conductor/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['magnum-conductor'] diff --git a/ansible/roles/mistral/tasks/start.yml b/ansible/roles/mistral/tasks/start.yml index 4045401d47..69f3de8fce 100644 --- a/ansible/roles/mistral/tasks/start.yml +++ b/ansible/roles/mistral/tasks/start.yml @@ -7,7 +7,7 @@ image: "{{ mistral_engine_image_full }}" volumes: - "{{ node_config_directory }}/mistral-engine/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['mistral-engine'] - name: Starting mistral-executor container @@ -18,7 +18,7 @@ image: "{{ mistral_executor_image_full }}" volumes: - "{{ node_config_directory }}/mistral-executor/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['mistral-executor'] - name: Starting mistral-api container @@ -29,5 +29,5 @@ image: "{{ mistral_api_image_full }}" volumes: - "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['mistral-api'] diff --git a/ansible/roles/murano/tasks/start.yml b/ansible/roles/murano/tasks/start.yml index 0bdb46ac2d..67176e67a9 100644 --- a/ansible/roles/murano/tasks/start.yml +++ b/ansible/roles/murano/tasks/start.yml @@ -7,7 +7,7 @@ name: "murano_engine" volumes: - "{{ node_config_directory }}/murano-engine/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['murano-engine'] - name: Starting murano-api container @@ -18,5 +18,5 @@ name: "murano_api" volumes: - "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['murano-api'] diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index c7b04b256e..d08681db86 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -44,7 +44,7 @@ name: "neutron_server" volumes: - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['neutron-server'] - name: Starting neutron-openvswitch-agent container @@ -58,7 +58,7 @@ - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: - neutron_plugin_agent == "openvswitch" - ((inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents']) and not (enable_nova_fake | bool)) or @@ -75,7 +75,7 @@ - "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: - inventory_hostname in groups['compute'] @@ -97,7 +97,7 @@ - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: - (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents']) - neutron_plugin_agent == "linuxbridge" @@ -112,5 +112,5 @@ volumes: - "{{ node_config_directory }}/neutron-agents/:{{ container_config_directory }}/:ro" - "/run:/run" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['neutron-agents'] diff --git a/ansible/roles/nova/tasks/start.yml b/ansible/roles/nova/tasks/start.yml index 22a4bec35a..1e26466bb6 100644 --- a/ansible/roles/nova/tasks/start.yml +++ b/ansible/roles/nova/tasks/start.yml @@ -26,7 +26,7 @@ volumes: - "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['nova-api'] - name: Starting nova-conductor container @@ -37,7 +37,7 @@ image: "{{ nova_conductor_image_full }}" volumes: - "{{ node_config_directory }}/nova-conductor/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['nova-conductor'] - name: Starting nova-consoleauth container @@ -48,7 +48,7 @@ name: "nova_consoleauth" volumes: - "{{ node_config_directory }}/nova-consoleauth/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['nova-consoleauth'] - name: Starting nova-novncproxy container @@ -59,7 +59,7 @@ name: "nova_novncproxy" volumes: - "{{ node_config_directory }}/nova-novncproxy/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: - inventory_hostname in groups['nova-novncproxy'] - nova_console == 'novnc' @@ -72,7 +72,7 @@ name: "nova_scheduler" volumes: - "{{ node_config_directory }}/nova-scheduler/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['nova-scheduler'] - name: Starting nova-spicehtml5proxy container @@ -83,7 +83,7 @@ name: "nova_spicehtml5proxy" volumes: - "{{ node_config_directory }}/nova-spicehtml5proxy/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: - inventory_hostname in groups['nova-spicehtml5proxy'] - nova_console == 'spice' @@ -99,7 +99,7 @@ - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" - "nova_compute:/var/lib/nova/" - "nova_libvirt:/var/lib/libvirt" when: @@ -114,7 +114,7 @@ name: "nova_compute_ironic" volumes: - "{{ node_config_directory }}/nova-compute-ironic/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: - inventory_hostname in groups['nova-compute-ironic'] - enable_ironic | bool @@ -130,7 +130,7 @@ - "{{ node_config_directory }}/nova-compute-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - "/run:/run" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: - inventory_hostname in groups['compute'] diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index 70c45101ac..adcd09f6c3 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -40,7 +40,7 @@ volumes: - "{{ node_config_directory }}/swift-rsyncd/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname not in groups['swift-proxy-server'] - name: Starting swift-proxy-server container @@ -52,7 +52,7 @@ volumes: - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-proxy-server/:{{ container_config_directory }}/:ro" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-proxy-server'] - name: Starting swift-account-server container @@ -65,7 +65,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-account-server/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-account-server'] - name: Starting swift-account-auditor container @@ -78,7 +78,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-account-auditor/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-account-server'] - name: Starting swift-account-replicator container @@ -91,7 +91,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-account-replicator/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-account-server'] - name: Starting swift-account-reaper container @@ -104,7 +104,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-account-reaper/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-account-server'] - name: Starting swift-container-server container @@ -117,7 +117,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-container-server/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-container-server'] - name: Starting swift-container-auditor container @@ -130,7 +130,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-container-auditor/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-container-server'] - name: Starting swift-container-replicator container @@ -143,7 +143,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-container-replicator/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-container-server'] - name: Starting swift-container-updater container @@ -156,7 +156,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-container-updater/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-container-server'] - name: Starting swift-object-server container @@ -169,7 +169,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-object-server/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-object-server'] - name: Starting swift-object-auditor container @@ -182,7 +182,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-object-auditor/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-object-server'] - name: Starting swift-object-replicator container @@ -195,7 +195,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-object-replicator/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-object-server'] - name: Starting swift-object-updater container @@ -208,7 +208,7 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-object-updater/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-object-server'] - name: Starting swift-object-expirer container @@ -221,5 +221,5 @@ - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-object-expirer/:{{ container_config_directory }}/:ro" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - - "/var/lib/kolla/dev/log:/dev/log" + - "/run/kolla/log:/dev/log" when: inventory_hostname in groups['swift-object-server'] diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index f45b34ddca..49e2522f34 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -33,13 +33,14 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Setup Docker repo and add signing key echo 'deb http://apt.dockerproject.org/repo ubuntu-trusty main' | sudo tee /etc/apt/sources.list.d/docker.list -sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D +sudo apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D sudo apt-get update sudo apt-get install -y --no-install-recommends docker-engine btrfs-tools sudo service docker stop setup_disk echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker +sudo mount --make-shared /run sudo service docker start sudo docker info diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index a04638f586..f6d7fbeaeb 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -46,6 +46,7 @@ setup_disk # Setup Docker sudo sed -i -r 's,(ExecStart)=(.+),\1=/usr/bin/docker daemon --storage-driver btrfs,' /usr/lib/systemd/system/docker.service +sudo sed -i 's|^MountFlags=.*|MountFlags=shared|' /usr/lib/systemd/system/docker.service sudo systemctl daemon-reload sudo systemctl start docker