From 63cb7d161f11fe88390dc0ede6663f018948a5c6 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 15 Jun 2015 17:22:23 -0400 Subject: [PATCH] Allow a user to define the OS for the Disk Image Change-Id: I9b505ddc3be6e985dbb06ba8f00f85fb928bc49b --- playbooks/roles/ironic-install/defaults/main.yml | 1 + playbooks/roles/ironic-install/tasks/create_dib_image.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/ironic-install/defaults/main.yml b/playbooks/roles/ironic-install/defaults/main.yml index 380bd4004..aa4206c61 100644 --- a/playbooks/roles/ironic-install/defaults/main.yml +++ b/playbooks/roles/ironic-install/defaults/main.yml @@ -7,6 +7,7 @@ nginx_port: 8080 ironicclient_source_install: false shade_source_install: true # Configuration information for diskimage-builder +dib_os_element: "ubuntu" dib_env_vars: DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive" ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements" diff --git a/playbooks/roles/ironic-install/tasks/create_dib_image.yml b/playbooks/roles/ironic-install/tasks/create_dib_image.yml index b59bf3424..482c50cf0 100644 --- a/playbooks/roles/ironic-install/tasks/create_dib_image.yml +++ b/playbooks/roles/ironic-install/tasks/create_dib_image.yml @@ -14,5 +14,5 @@ # limitations under the License. --- - name: "Initiate image build" - shell: disk-image-create -a amd64 -o "{{http_boot_folder}}/{{deploy_image_filename}}" -t qcow2 vm ubuntu serial-console cloud-init-datasources "{{ extra_dib_elements}}" + shell: disk-image-create -a amd64 -o "{{http_boot_folder}}/{{deploy_image_filename}}" -t qcow2 "{{dib_os_element}}" vm serial-console cloud-init-datasources "{{ extra_dib_elements}}" environment: dib_env_vars