Merge "Add new enable_container_images_build setting"

elements/puppet-stack-config/puppet-stack-config.yaml.template

@@ -778,6 +778,7 @@ enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}}
 enable_legacy_ceilometer_collector: {{ENABLE_LEGACY_CEILOMETER_COLLECTOR}}
 enable_ui: {{ENABLE_UI}}
 enable_cinder: {{ENABLE_CINDER}}
+enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}}
 
 # Path to install configuration files
 tripleo_install_user: {{TRIPLEO_INSTALL_USER}}

instack_undercloud/undercloud.py

@@ -333,6 +333,11 @@ _opts = [
                 help=('Whether to install novajoin metadata service in '
                       'the Undercloud.')
                 ),
+    cfg.BoolOpt('enable_container_images_build',
+                default=True,
+                help=('Whether to enable docker container images to be build '
+                      'on the undercloud.')
+                ),
     cfg.StrOpt('ipa_otp',
                default='',
                help=('One Time Password to register Undercloud node with '

undercloud.conf.sample

@@ -205,6 +205,10 @@
 # List of enabled bare metal drivers. (list value)
 #enabled_drivers = pxe_ipmitool,pxe_drac,pxe_ilo
 
+# Whether to enable docker container images to be build on the undercloud.
+# Note this installs the required packages but does not build the images
+# automatically.
+#enable_container_images_build = true
 
 # An optional docker 'registry-mirror' that will be
 # configured in /etc/docker/daemon.json.