Move debug sleep to the proper location
Change-Id: If76cfd4157cbfccf931ff7e6a321c4deea6d9ea4
diff --git a/playbooks/setup-openstack-storpool/pre.yaml b/playbooks/setup-openstack-storpool/pre.yaml
index 6c86de0..ad03640 100644
--- a/playbooks/setup-openstack-storpool/pre.yaml
+++ b/playbooks/setup-openstack-storpool/pre.yaml
@@ -240,39 +240,48 @@
vars_files:
- vars.yaml
tasks:
- - set_fact:
- sp_api_mac: "{{ hostvars['undercloud-client']['port_node_1_sp_api_mac'] }}"
- sp0_mac: "{{ hostvars['undercloud-client']['port_node_1_sp0_mac'] }}"
- sp1_mac: "{{ hostvars['undercloud-client']['port_node_1_sp1_mac'] }}"
- sp_api_ip: "{{ ip_node_1_sp_api }}/24"
- sp0_ip: "{{ ip_node_1_sp0 }}/24"
- sp1_ip: "{{ ip_node_1_sp1 }}/24"
+ - name: Temp block
+ block:
+ - set_fact:
+ sp_api_mac: "{{ hostvars['undercloud-client']['port_node_1_sp_api_mac'] }}"
+ sp0_mac: "{{ hostvars['undercloud-client']['port_node_1_sp0_mac'] }}"
+ sp1_mac: "{{ hostvars['undercloud-client']['port_node_1_sp1_mac'] }}"
+ sp_api_ip: "{{ ip_node_1_sp_api }}/24"
+ sp0_ip: "{{ ip_node_1_sp0 }}/24"
+ sp1_ip: "{{ ip_node_1_sp1 }}/24"
- - set_fact:
- storpool_netplan: "{{ hostvars['localhost'].STORPOOL_STORPOOL_NETPLAN.v }}"
- no_log: true
+ - set_fact:
+ storpool_netplan: "{{ hostvars['localhost'].STORPOOL_STORPOOL_NETPLAN.v }}"
+ no_log: true
- - name: Provision the Netplan Template
- no_log: true
- become: true
- ansible.builtin.copy:
- content: "{{ storpool_netplan }}"
- dest: /etc/netplan/61-storpool.yaml
+ - name: Provision the Netplan Template
+ no_log: true
+ become: true
+ ansible.builtin.copy:
+ content: "{{ storpool_netplan }}"
+ dest: /etc/netplan/61-storpool.yaml
- - name: Generate and Restart Netplan
- become: true
- ansible.builtin.command:
- argv: "{{ item }}"
- loop:
- - [ "netplan", "generate"]
- - [ "netplan", "apply" ]
+ - name: Generate and Restart Netplan
+ become: true
+ ansible.builtin.command:
+ argv: "{{ item }}"
+ loop:
+ - [ "netplan", "generate"]
+ - [ "netplan", "apply" ]
- - name: Provision StorPool Deployment Configuration
- no_log: true
- ansible.builtin.lineinfile:
- path: "{{ storpool_node_homedir }}/.ssh/authorized_keys"
- line: "{{ STORPOOL_DEPLOY_KEY_PUB['v'] }}"
- insertafter: EOF
+ - name: Provision StorPool Deployment Configuration
+ no_log: true
+ ansible.builtin.lineinfile:
+ path: "{{ storpool_node_homedir }}/.ssh/authorized_keys"
+ line: "{{ STORPOOL_DEPLOY_KEY_PUB['v'] }}"
+ insertafter: EOF
+ always:
+ - name: Debug sleep
+ become: true
+ ansible.builtin.command:
+ argv: "{{ item }}"
+ loop:
+ - [ "sleep", "9999" ]
- hosts: controller
vars_files:
@@ -314,13 +323,6 @@
path: "{{ openstack_node_homedir }}/.ssh/authorized_keys"
line: "{{ STORPOOL_DEPLOY_KEY_PUB['v'] }}"
insertafter: EOF
- always:
- - name: Debug sleep
- become: true
- ansible.builtin.command:
- argv: "{{ item }}"
- loop:
- - [ "sleep", "9999" ]
when: storpool_connection == "block"