Align stars to fix stable/pike gate on scenario001

1) Fix path for iscsi config file

We changed the bind mount to be /etc/iscsi in
I838427ccae06cfe1be72939c4bcc2978f7dc36a8, we need to copy the files to
/etc/iscsi so that they do not end up at '/' in the container.

Change-Id: Id5c1f16d08ffd36a35a6669d64460a7b2240d401
Closes-Bug: #1741850
(cherry picked from commit 8eb351d588)

2) Fix puppet config volume for iscsid in containers

Bind mount the /etc/iscsi host path for iscsi container puppet config.
Use the real host path /etc/iscsi for containers dependsing on it.

Closes-bug: #1735425

Change-Id: I838427ccae06cfe1be72939c4bcc2978f7dc36a8
Co-authored-by: Alan Bishop <abishop@redhat.com>
Co-authored-by: Martin André <m.andre@redhat.com>
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 82f128f15b)

3) Allow to override manage polling param

Without this, we cannot override the polling yaml metrics
from puppet template.

Change-Id: I509dd4932402c458e222c52b5d7d5e370a5466c0
(cherry picked from commit e870783b2c)

4) Disable voting on scenario001 - now timeouting to ssh the VM created
   by Tempest.

Related-Bug: 1742936

5) Update Ceph container CPU/memory limits in Ceph scenarios

Ceph containers are started with `docker run --memory`
and `docker run --cpus` to limit their memory and CPU
resources. The defaults for OSD and MDS containers were
recently increased [1] to values better for production
but this change keeps them at lower values just for
CI.

[1] https://github.com/ceph/ceph-ansible/pull/2304

Change-Id: I5b5cf5cc52907af092bea5e162d4b577ee05c23a
Related-Bug: 1741499
(cherry picked from commit d68619a26e)

ci/environments/scenario001-multinode-containers.yaml

@@ -122,6 +122,8 @@ parameter_defaults:
   CephPoolDefaultSize: 1
   CephAnsibleExtraConfig:
     centos_package_dependencies: []
+    ceph_osd_docker_memory_limit: '1g'
+    ceph_mds_docker_memory_limit: '1g'
   CephAnsibleSkipTags: ''
   #NOTE: These ID's and keys should be regenerated for
   # a production deployment. What is here is suitable for

ci/environments/scenario004-multinode-containers.yaml

@@ -103,6 +103,8 @@ parameter_defaults:
   CephPoolDefaultSize: 1
   CephAnsibleExtraConfig:
     centos_package_dependencies: []
+    ceph_osd_docker_memory_limit: '1g'
+    ceph_mds_docker_memory_limit: '1g'
   CephAnsibleSkipTags: ''
   #NOTE: These ID's and keys should be regenerated for
   # a production deployment. What is here is suitable for

docker/services/cinder-backup.yaml

@@ -95,7 +95,7 @@ outputs:
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
           permissions:
@@ -134,7 +134,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/cinder_backup.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - /dev/:/dev/
                   - /run/:/run/

docker/services/cinder-volume.yaml

@@ -108,7 +108,7 @@ outputs:
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
           permissions:
@@ -145,7 +145,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - /lib/modules:/lib/modules:ro
                   - /dev/:/dev/

docker/services/iscsid.yaml

@@ -69,13 +69,18 @@ outputs:
         step_config: *step_config
         config_image: {get_param: DockerIscsidConfigImage}
         volumes:
+          # NOTE(bogdando) Containerized or running on baremetal services
+          # on a node must use the same iSCSI Qualified Name (IQN).
+          # However, overcloud nodes must have a unique IQN. Allow full
+          # (write) access to /etc/iscsi so that puppet ensures the IQN
+          # is unique and is reset once, and only once.
           - /etc/iscsi:/etc/iscsi
       kolla_config:
         /var/lib/kolla/config_files/iscsid.json:
           command: /usr/sbin/iscsid -f
           config_files:
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
       docker_config:
@@ -95,7 +100,7 @@ outputs:
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
-                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/multipathd.yaml

@@ -61,7 +61,7 @@ outputs:
           command: /usr/sbin/multipathd -d
           config_files:
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
       docker_config:
@@ -77,7 +77,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /dev/:/dev/
                   - /run/:/run/
                   - /sys:/sys

docker/services/nova-compute.yaml

@@ -100,7 +100,7 @@ outputs:
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-ceph/"
@@ -136,7 +136,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - /dev:/dev
                   - /lib/modules:/lib/modules:ro

docker/services/nova-ironic.yaml

@@ -82,7 +82,7 @@ outputs:
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
           permissions:
@@ -106,7 +106,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /run:/run
                   - /dev:/dev
                   - /var/lib/nova/:/var/lib/nova:shared

docker/services/pacemaker/cinder-backup.yaml

@@ -118,7 +118,7 @@ outputs:
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
           permissions:

docker/services/pacemaker/cinder-volume.yaml

@@ -115,7 +115,7 @@ outputs:
               merge: true
               preserve_properties: true
             - source: "/var/lib/kolla/config_files/src-iscsid/*"
-              dest: "/"
+              dest: "/etc/iscsi/"
               merge: true
               preserve_properties: true
           permissions:

puppet/services/ceilometer-base.yaml

@@ -66,6 +66,10 @@ parameters:
         collector is used, override this with notifier:// publisher.
         Set ManagePipeline to true for override to take effect.
     type: comma_delimited_list
+  ManagePolling:
+    default: false
+    description: Whether to manage polling.yaml.
+    type: boolean
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
@@ -146,6 +150,7 @@ outputs:
         ceilometer::agent::notification::event_pipeline_publishers: {get_param: EventPipelinePublishers}
         ceilometer::agent::notification::manage_pipeline: {get_param: ManagePipeline}
         ceilometer::agent::notification::pipeline_publishers: {get_param: PipelinePublishers}
+        ceilometer::agent::polling::manage_polling: {get_param: ManagePolling}
         ceilometer::agent::auth::auth_region: {get_param: KeystoneRegion}
         ceilometer::agent::auth::auth_tenant_name: 'service'
         ceilometer::agent::auth::auth_user_domain_name: 'Default'

zuul.d/layout.yaml

@@ -45,6 +45,7 @@
               - ci/environments/scenario001-multinode-containers.yaml
               - ci/pingtests/scenario001.*$
               - ^environments\/.*.yaml
+            voting: false
         - tripleo-ci-centos-7-scenario002-multinode-oooq:
             files:
               - ^puppet/services/aodh.*$