From 7a4734ba976abb8496357c19b482fc3a53b1f8e4 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 7 Apr 2017 16:24:34 -0400 Subject: [PATCH] Set step == 1 for base docker profile In I75c740e7efc6662861c28caeb7fa965ba55438cb we are making use of ::tripleo::profile::base::docker via the tripleo::profile::base::docker_registry class. This helps avoid duplicate puppet resources that configure the docker service and package within these modules. As part of this we need to set step == 1 for the new ::tripleo::profile::base::docker class because it is in use by t-h-t which has a stepwise architecture. Change-Id: I6154f4c7435b02b92f6f64687e9ee89d6b86186a --- elements/puppet-stack-config/puppet-stack-config.yaml.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 3abc468e7..10dc180fd 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -711,6 +711,9 @@ tripleo::haproxy::zaqar_api: true tripleo::haproxy::zaqar_ws: true tripleo::haproxy::docker_registry: true +# Docker +tripleo::profile::base::docker::step: 1 + # Keepalived tripleo::keepalived::controller_virtual_ip: "%{hiera('controller_admin_host')}" tripleo::keepalived::control_virtual_interface: 'br-ctlplane'