summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch
blob: 454cef6862fa30f22178bb31c2c9c98750724a91 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
Date: Thu, 3 Mar 2016 19:04:07 +0100
Subject: [PATCH] Build bootstrap image for arm64

For now the arch is hardcoded for simplicity. We should detect this
but how? If we're multi-arch then one bootstrap image should be built
per supported arch. This requires Fuel refactoring.
---
 build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/build/bootstrap_admin_node.sh.patch
+++ b/build/bootstrap_admin_node.sh.patch
@@ -53,6 +53,23 @@
   # Enable iptables
   systemctl enable iptables.service
 ***************
+*** 484,490 ****
+          local ret=1
+          echo ${bs_progress_message} >&2
+          set_ui_bootstrap_error "${bs_progress_message}" >&2
+!         if fuel-bootstrap -v --debug build --activate >>"$bs_build_log" 2>&1; then
+            ret=0
+            fuel notify --topic "done" --send "${bs_done_message}"
+          else
+--- 484,490 ----
+          local ret=1
+          echo ${bs_progress_message} >&2
+          set_ui_bootstrap_error "${bs_progress_message}" >&2
+!         if fuel-bootstrap -v --debug build --target_arch arm64 --activate >>"$bs_build_log" 2>&1; then
+            ret=0
+            fuel notify --topic "done" --send "${bs_done_message}"
+          else
+***************
 *** 529,534 ****
 --- 541,556 ----
   
> RoleParameters: default: {} description: Parameters specific to the role type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json MonitoringSubscriptionGnocchiMetricd: default: 'overcloud-gnocchi-metricd' type: string GnocchiMetricdWorkers: default: '%{::os_workers}' description: Number of workers for Gnocchi MetricD type: string resources: GnocchiServiceBase: type: ./gnocchi-base.yaml properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} outputs: role_data: description: Role data for the Gnocchi role. value: service_name: gnocchi_metricd monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiMetricd} config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] - gnocchi::metricd::workers: {get_param: GnocchiMetricdWorkers} step_config: | include ::tripleo::profile::base::gnocchi::metricd upgrade_tasks: - name: Check if gnocchi_metricd is deployed command: systemctl is-enabled openstack-gnocchi-metricd tags: common ignore_errors: True register: gnocchi_metricd_enabled - name: "PreUpgrade step0,validation: Check service openstack-gnocchi-metricd is running" shell: /usr/bin/systemctl show 'openstack-gnocchi-metricd' --property ActiveState | grep '\bactive\b' when: gnocchi_metricd_enabled.rc == 0 tags: step0,validation - name: Stop gnocchi_metricd service tags: step1 when: gnocchi_metricd_enabled.rc == 0 service: name=openstack-gnocchi-metricd state=stopped