diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 19:37:20 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 12:01:02 +0000 |
| commit | 2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch) | |
| tree | aa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | |
| parent | 85c96cb879081b3b13a6d53c50866637d09f9f42 (diff) | |
Rebase: p/fuel-library: Update after 96da5b4a.
Refresh patches after:
"Move openstack specific tasks to their own folder structure"
NOTE: The qemu-kvm change patch
(0003-Make-qemu-kvm-architecture-aware.patch) only affects
RedHat systems, so it is optional, at least for the current stage.
[1] https://github.com/openstack/fuel-library/commit/
96da5b4a1eb82a76fb416d93f5249dc32e2499f2
Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b
Diffstat (limited to 'patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch')
| -rw-r--r-- | patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch index b9a8ed10..016d1f12 100644 --- a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch +++ b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch @@ -6,7 +6,7 @@ This depends on cirros-testvm package to contain both amd64 and arm64 images. --- deployment/puppet/openstack/manifests/img/cirros.pp | 8 ++++++-- - .../puppet/osnailyfacter/modular/generate_vms/generate_vms.pp | 11 +++++++++++ + puppet/osnailyfacter/manifests/generate_vms/vm_config.pp | 11 +++++++++++ deployment/puppet/osnailyfacter/templates/vm_libvirt.erb | 9 ++++++++- files/fuel-migrate/fuel-migrate | 5 ++++- 4 files changed, 29 insertions(+), 4 deletions(-) @@ -43,10 +43,10 @@ index 84e202e..cff06e0 100644 unless => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index && (/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index | grep ${img_name})", } -diff --git a/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp b/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp +diff --git a/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp b/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp index 6d5426a..da5954e 100644 ---- a/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp -+++ b/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp +--- a/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp ++++ b/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp @@ -11,6 +11,17 @@ define vm_config { $details = $name $id = $details['id'] |