Merge "Fix rights to local_settings.d for dockerized Horizon" into stable/pike

diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index d8a93b1..46873ea 100644 (file)
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@ -125,6 +125,7 @@ outputs:
         step_4:
           cinder_volume:
             image: *cinder_volume_image
+            ipc: host
             net: host
             privileged: true
             restart: always

diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml
index 9f982f8..2c894da 100644 (file)
--- a/docker/services/containers-common.yaml
+++ b/docker/services/containers-common.yaml
@@ -64,7 +64,6 @@ outputs:
           # Syslog socket
           - /dev/log:/dev/log
           - /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro
-          - /sys/fs/selinux:/sys/fs/selinux
         - if:
           - internal_tls_enabled
           - - list_join:

diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 174acd4..aeba7d7 100644 (file)
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -202,7 +202,7 @@ outputs:
           volumes:
             list_concat:
             -
-              - /var/lib/mysql:/var/lib/mysql/:ro
+              - /var/lib/mysql:/var/lib/mysql/:rw
               - /var/log/containers/mysql:/var/log/mariadb
               - /var/lib/config-data/mysql/root:/root:ro #provides .my.cnf
             - if:

diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 883f438..b43193e 100644 (file)
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -115,6 +115,7 @@ outputs:
         step_4:
           nova_compute:
             image: &nova_compute_image {get_param: DockerNovaComputeImage}
+            ipc: host
             net: host
             privileged: true
             user: nova
@@ -130,7 +131,7 @@ outputs:
                   - /dev:/dev
                   - /lib/modules:/lib/modules:ro
                   - /run:/run
-                  - /var/lib/nova:/var/lib/nova
+                  - /var/lib/nova:/var/lib/nova:shared
                   - /var/lib/libvirt:/var/lib/libvirt
                   - /var/log/containers/nova:/var/log/nova
                   - /sys/class/net:/sys/class/net

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 1bed40e..f41d197 100644 (file)
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -109,7 +109,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                   - /run:/run
                   - /dev:/dev
-                  - /var/lib/nova/:/var/lib/nova
+                  - /var/lib/nova/:/var/lib/nova:shared
                   - /var/log/containers/nova:/var/log/nova
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index df16894..13dbec9 100644 (file)
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -174,7 +174,7 @@ outputs:
                   - /dev:/dev
                   - /run:/run
                   - /sys/fs/cgroup:/sys/fs/cgroup
-                  - /var/lib/nova:/var/lib/nova
+                  - /var/lib/nova:/var/lib/nova:shared
                   - /var/run/libvirt:/var/run/libvirt
                   - /var/lib/libvirt:/var/lib/libvirt
                   - /etc/libvirt/qemu:/etc/libvirt/qemu:ro
@@ -199,13 +199,14 @@ outputs:
                   - /dev:/dev
                   - /run:/run
                   - /sys/fs/cgroup:/sys/fs/cgroup
-                  - /var/lib/nova:/var/lib/nova
+                  - /var/lib/nova:/var/lib/nova:shared
                   - /etc/libvirt:/etc/libvirt
                   - /var/run/libvirt:/var/run/libvirt
                   - /var/lib/libvirt:/var/lib/libvirt
                   - /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro
                   - /var/log/containers/nova:/var/log/nova
                   - /var/lib/vhost_sockets:/var/lib/vhost_sockets
+                  - /sys/fs/selinux:/sys/fs/selinux
                 -
                   if:
                     - use_tls_for_live_migration

diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml
index cb3b950..7909e41 100644 (file)
--- a/docker/services/nova-migration-target.yaml
+++ b/docker/services/nova-migration-target.yaml
@@ -149,6 +149,6 @@ outputs:
                   - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
                   - /etc/ssh/:/host-ssh/:ro
                   - /run:/run
-                  - /var/lib/nova:/var/lib/nova
+                  - /var/lib/nova:/var/lib/nova:shared
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

diff --git a/environments/deployed-server-pacemaker-environment.yaml b/environments/deployed-server-pacemaker-environment.yaml
index cc9ea99..83d81bb 100644 (file)
--- a/environments/deployed-server-pacemaker-environment.yaml
+++ b/environments/deployed-server-pacemaker-environment.yaml
@@ -1,4 +1,4 @@
 resource_registry:
-  OS::TripleO::Tasks::ControllerDeployedServerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
-  OS::TripleO::Tasks::ControllerDeployedServerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml
+  OS::TripleO::Tasks::ControllerDeployedServerPreConfig: OS::Heat::None
+  OS::TripleO::Tasks::ControllerDeployedServerPostConfig: OS::Heat::None
   OS::TripleO::Tasks::ControllerDeployedServerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml