Non-HA container images are not updated.

[Sofer Athlan-Guyot]

Hi,

on master, the non HA container images are not updated during the images:

[heat-admin@overcloud-controller-0 ~]$ sudo docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
dba2bcebab19 192.168.24.1:8787/tripleomaster/centos-binary-ovn-northd:pcmklatest "dumb-init --singl..." 3 hours ago Up 3 hours ovn-dbs-bundle-docker-0
d63ebfce1a47 192.168.24.1:8787/tripleomaster/centos-binary-haproxy:pcmklatest "dumb-init --singl..." 3 hours ago Up 3 hours haproxy-bundle-docker-0
f0d6eb68b913 192.168.24.1:8787/tripleomaster/centos-binary-redis:pcmklatest "dumb-init --singl..." 3 hours ago Up 3 hours redis-bundle-docker-0
42ea1b37da94 192.168.24.1:8787/tripleomaster/centos-binary-mariadb:pcmklatest "dumb-init -- /bin..." 3 hours ago Up 3 hours galera-bundle-docker-0
0a6270a6b52a 192.168.24.1:8787/tripleomaster/centos-binary-rabbitmq:pcmklatest "dumb-init --singl..." 3 hours ago Up 3 hours rabbitmq-bundle-docker-0
fc00fefc823d 192.168.24.1:8787/tripleomaster/centos-binary-mariadb:12a897fb9b218be970090996da0e21a82cedda1a_aba8ec54 "dumb-init -- koll..." 18 hours ago Up 3 hours clustercheck
065689b14e3e 192.168.24.1:8787/tripleomaster/centos-binary-ovn-controller:12a897fb9b218be970090996da0e21a82cedda1a_aba8ec54 "dumb-init --singl..." 24 hours ago Up 3 hours (healthy)

(undercloud) [stack@undercloud ~]$ cat containers-prepare-parameter.yaml
parameter_defaults:
  DockerInsecureRegistryAddress:
  - 192.168.24.1:8787
  ContainerImagePrepare:
  - push_destination: "192.168.24.1:8787"
    set:
      tag: "4c41e65415e9d20861e6652c9a4252cd4ef0796d_1b4dbe8b"
      namespace: "docker.io/tripleomaster"
      name_prefix: "centos-binary-"
      name_suffix: ""
      rhel_containers: "false"
      ceph_namespace: "docker.io/ceph"
      ceph_image: "daemon"
      ceph_tag: "v4.0.0-stable-4.0-nautilus-centos-7-x86_64"

We should see 4c41e6 everywhere.

We can see that /var/lib/container-puppet/container-puppet.json is not updated on the node:

    {
        "config_image": "192.168.24.1:8787/tripleomaster/centos-binary-ovn-controller:12a897fb9b218be970090996da0e21a82cedda1a_aba8ec54",
        "config_volume": "ovn_controller",
        "puppet_tags": "vs_config,exec",
        "step_config": "include ::tripleo::profile::base::neutron::agents::ovn\n",
        "volumes": [
            "/lib/modules:/lib/modules:ro",
            "/run/openvswitch:/run/openvswitch:shared,z",
            "/etc/sysconfig/modules:/etc/sysconfig/modules"
        ]
    },

This is certainly linked to that review Id5985ce8ac741baa9adc9f5874df0459fd4c24b2 .

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/688967

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/688967
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=6e649ccc7e38b32426c6e6704b01a58fe87c1e91
Submitter: Zuul
Branch: master

commit 6e649ccc7e38b32426c6e6704b01a58fe87c1e91
Author: Sofer Athlan-Guyot <email address hidden>
Date: Wed Oct 16 16:21:08 2019 +0200

    Fix update of non HA container during update.

    After the refactoring of step_1 to improve speed during deployment, we
    were not updating the /var/lib/container-puppet/container-puppet.json
    or the container-startup-configs.json for instance.

    Net result is that the configuration is being done on the initially
    deployed container and non HA container are not updated.

    Note that not all step1 tasks were refarctored into the
    deploy_steps_tasks_step_1. So we still need to loop over step 1 in the
    deploy_steps_tasks.

    Closes-Bug: #1848359

    Change-Id: I76b16cd7781ea601778004afa4e0bc3020ce3c59

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 11.3.0 release.