From b0ee8629313779936e5e359529e9cf348675d9d1 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 15 Dec 2014 16:42:38 -0500 Subject: [PATCH] Preserve/Restore iscsi initiatorname file Added logic to preserve and restore the iscsi initiator name file as without it open-iscsi will automatically generate a new file upon restarting which it will utilize to identify itself. Change-Id: I2bba352ca990c4b96e390103afc684261e745eac --- playbooks/step_preserve_iscsi_initiator.yml | 21 +++++++++++++++++++++ playbooks/step_restore_iscsi_initiator.yml | 21 +++++++++++++++++++++ playbooks/update_cloud.yml | 5 ++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 playbooks/step_preserve_iscsi_initiator.yml create mode 100644 playbooks/step_restore_iscsi_initiator.yml diff --git a/playbooks/step_preserve_iscsi_initiator.yml b/playbooks/step_preserve_iscsi_initiator.yml new file mode 100644 index 0000000..506bb25 --- /dev/null +++ b/playbooks/step_preserve_iscsi_initiator.yml @@ -0,0 +1,21 @@ +# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- +- name: "Ensure /mnt/state/etc/iscsi/ exists" + sudo: yes + file: path=/mnt/state/etc/iscsi/ state=directory mode=0755 +- name: "Backup /etc/iscsi/initiatorname.iscsi to /mnt/state/etc/iscsi/initiatorname.iscsi" + sudo: yes + command: cp -a /etc/iscsi/initiatorname.iscsi /mnt/state/etc/iscsi/initiatorname.iscsi diff --git a/playbooks/step_restore_iscsi_initiator.yml b/playbooks/step_restore_iscsi_initiator.yml new file mode 100644 index 0000000..e3e701c --- /dev/null +++ b/playbooks/step_restore_iscsi_initiator.yml @@ -0,0 +1,21 @@ +# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- +- name: "Restoring the open-iscsi initiator name file" + sudo: yes + command: cp -a /mnt/state/etc/iscsi/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi +- name: "Restarting the open-iscsi service" + sudo: yes + service: name=open-iscsi state=restarted diff --git a/playbooks/update_cloud.yml b/playbooks/update_cloud.yml index 2e1117c..7e9dfb2 100644 --- a/playbooks/update_cloud.yml +++ b/playbooks/update_cloud.yml @@ -501,6 +501,8 @@ gather_facts: yes max_fail_percentage: 0 tasks: + - include: step_preserve_iscsi_initiator.yml + when: instance_status == "ACTIVE" - include: step_preserve_password_file.yml when: instance_status == "ACTIVE" - include: step_update_rebuild_node.yml @@ -523,7 +525,8 @@ max_fail_percentage: 0 tasks: - include: step_os-apply-config.yml - - pause: seconds=45 prompt="Giving the compute node sixty seconds to complete existing processes" + - include: step_restore_iscsi_initiator.yml + - pause: seconds=45 prompt="Giving the compute node forty-five seconds to complete existing processes" when: online_upgrade is not defined # Write out config files in as we might be getting in while the # system is starting up.