Disabling cdrom for VM instances.

diff --git a/lib/cr_tf/handler/files.py b/lib/cr_tf/handler/files.py
index 8d58328e862cad924a08cdfcd88d336933d068bd..58fa231933f65668e8b242b16d6be24dec6b4258 100644 (file)
--- a/lib/cr_tf/handler/files.py
+++ b/lib/cr_tf/handler/files.py
@@ -27,7 +27,7 @@ from ..errors import AbortExecution
 
 from ..xlate import XLATOR
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -567,13 +567,6 @@ class CrTfHandlerFilesMixin():
         for disk_name in sorted(vm.disks.keys()):
             content += self._create_instfile_disk(vm, disk_name)
 
-        content += textwrap.indent(textwrap.dedent('''\
-        cdrom {
-          client_device = "true"
-        }
-
-        '''), '  ')
-
         content += self._create_instfile_custom(vm, tpl_vm)
 
         if self.verbose > 1:

diff --git a/postinstall-scripts/init-puppet b/postinstall-scripts/init-puppet
index 19afd40af0c11bfbda0e1dbf23b75a11105703e1..ccd74a2f915dcd910297b3fa09a88ebe75822fc3 100755 (executable)
--- a/postinstall-scripts/init-puppet
+++ b/postinstall-scripts/init-puppet
@@ -585,12 +585,12 @@ generate_csr_attributes() {
     local yfile="${conf_dir}/csr_attributes.yaml"
     info "Generating '${GREEN}${yfile}${NORMAL}' ..."
     local content=$( cat <<-EOF
-        ---
-        extension_requests:
-          1.3.6.1.4.1.34380.1.2.1: '${CUSTOMER}'
-          1.3.6.1.4.1.34380.1.2.2: '${PROJECT}'
-          1.3.6.1.4.1.34380.1.2.3: '${TIER}'
-        EOF
+               ---
+               extension_requests:
+                 1.3.6.1.4.1.34380.1.2.1: '${CUSTOMER}'
+                 1.3.6.1.4.1.34380.1.2.2: '${PROJECT}'
+                 1.3.6.1.4.1.34380.1.2.3: '${TIER}'
+               EOF
     )
     debug "Generatet content of '${yfile}':\n${content}"
     echo "${content}" > "${yfile}"