Rebase: ODL Fuel plugin arm64 support patch.

[armband.git] / patches / fuel-library / 0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch

diff --git a/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch b/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
index 8253aca..81377ad 100644 (file)
--- a/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
+++ b/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
@@ -5,33 +5,31 @@ Subject: [PATCH] m1.micro: Increase profile RAM size to 128MB.
 TestVM (cirros) on aarch64 requires more than 64MB RAM.
 Keep profiles uniform across all archs.
 ---
- .../osnailyfacter/modular/openstack-controller/openstack-controller.pp  | 2 +-
+ .../openstack_tasks/manifests/openstack_controller/openstack_controller.pp  | 2 +-
  tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
+diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
 index b1d8795..88e0ab3 100644
---- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
-+++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
+--- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
++++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
 @@ -233,7 +233,7 @@ if $primary_controller {
-       "OS_REGION_NAME=${region}",
-       "NOVA_ENDPOINT_TYPE=internalURL",
-     ],
--    command   => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
-+    command   => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
-     #FIXME(mattymo): Upstream bug PUP-2299 for retries in unless/onlyif
-     # Retry nova-flavor list until it exits 0, then exit with grep status,
-     # finally exit 1 if tries exceeded
+         "OS_REGION_NAME=${region}",
+         "NOVA_ENDPOINT_TYPE=internalURL",
+       ],
+-      command   => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
++      command   => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
+       #FIXME(mattymo): Upstream bug PUP-2299 for retries in unless/onlyif
+       # Retry nova-flavor list until it exits 0, then exit with grep status,
+       # finally exit 1 if tries exceeded
 diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
 index 36161e6..b15da07 100644
 --- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
 +++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
-@@ -171,7 +171,7 @@ describe manifest do
+@@ -399,5 +399,5 @@ describe manifest do
      if primary_controller
        it 'should retry unless when creating m1.micro flavor' do
          should contain_exec('create-m1.micro-flavor').with(
 -           'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
 +           'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
             'unless'  => 'bash -c \'for tries in {1..10}; do
-                     nova flavor-list | grep m1.micro;
-                     status=("${PIPESTATUS[@]}");