Merge "Add option to not update packages during undercloud install"

elements/puppet-stack-config/puppet-stack-config.pp

@@ -20,19 +20,21 @@ class { '::tripleo::network::os_net_config':
 }
 
 # Upgrade packaging.
-case $::osfamily {
-  'RedHat': {
-    $pkg_upgrade_cmd = 'yum -y update'
+if hiera('update_packages') {
+  case $::osfamily {
+    'RedHat': {
+      $pkg_upgrade_cmd = 'yum -y update'
+    }
+    default: {
+      warning('Please specify a package upgrade command for distribution.')
+    }
   }
-  default: {
-    warning('Please specify a package upgrade command for distribution.')
+  exec { 'package-upgrade':
+    command => $pkg_upgrade_cmd,
+    path    => '/usr/bin',
+    timeout => 0,
   }
 }
-exec { 'package-upgrade':
-  command => $pkg_upgrade_cmd,
-  path    => '/usr/bin',
-  timeout => 0,
-}
 # Ensure Puppet will update packages using Package provider
 # so Puppet OpenStack modules will notify db_sync commands for each service.
 Package<| tag == 'openstack' |> { ensure => latest }

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

@@ -4,6 +4,7 @@ keystone_auth_uri_v2: {{UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC}}/v2.0
 keystone_region: 'regionOne'
 
 debug: {{UNDERCLOUD_DEBUG}}
+update_packages: {{UNDERCLOUD_UPDATE_PACKAGES}}
 controller_host: {{LOCAL_IP}} #local-ipv4
 controller_admin_vip: {{UNDERCLOUD_ADMIN_VIP}}
 controller_public_vip: {{UNDERCLOUD_PUBLIC_VIP}}

instack_undercloud/undercloud.py

@@ -285,6 +285,11 @@ _opts = [
                 help=('Whether to enable the debug log level for Undercloud '
                       'OpenStack services.')
                 ),
+    cfg.BoolOpt('undercloud_update_packages',
+                default=True,
+                help=('Whether to update packages during the Undercloud '
+                      'install.')
+                ),
     cfg.BoolOpt('enable_tempest',
                 default=True,
                 help=('Whether to install Tempest in the Undercloud.')

undercloud.conf.sample

@@ -137,6 +137,10 @@
 # services. (boolean value)
 #undercloud_debug = true
 
+# Whether to update packages during the Undercloud install. (boolean
+# value)
+#undercloud_update_packages = true
+
 # Whether to install Tempest in the Undercloud. (boolean value)
 #enable_tempest = true