Fix bugs
Change-Id: I4d94b15c43aab18301c9ab5f757e7ecfc3bbf85a
diff --git a/playbooks/setup-openstack-storpool/pre.yaml b/playbooks/setup-openstack-storpool/pre.yaml
index 813633a..5674e4c 100644
--- a/playbooks/setup-openstack-storpool/pre.yaml
+++ b/playbooks/setup-openstack-storpool/pre.yaml
@@ -52,8 +52,8 @@
loop:
- { network: "{{ network_sp_api }}", subnet: "{{ subnet_sp_api }}", ip: "{{ ip_node_1_sp_api }}", port: "{{ port_node_1_sp_api }}" }
- { network: "{{ network_sp_api }}", subnet: "{{ subnet_sp_api }}", ip: "{{ ip_node_2_sp_api }}", port: "{{ port_node_2_sp_api }}" }
- - { network: "{{ network_sp0 }}", subnet: "{{ subnet_sp0 }}", ip: "{{ port_node_1_ip_sp0 }}", port: "{{ port_node_1_sp0 }}" }
- - { network: "{{ network_sp1 }}", subnet: "{{ subnet_sp1 }}", ip: "{{ port_node_1_ip_sp1 }}", port: "{{ port_node_1_sp1 }}" }
+ - { network: "{{ network_sp0 }}", subnet: "{{ subnet_sp0 }}", ip: "{{ ip_node_1_sp0 }}", port: "{{ port_node_1_sp0 }}" }
+ - { network: "{{ network_sp1 }}", subnet: "{{ subnet_sp1 }}", ip: "{{ ip_node_1_sp1 }}", port: "{{ port_node_1_sp1 }}" }
# TODO: Support port security
- name: Create the StorPool Ports for the Block Client OpenStack Node
@@ -238,8 +238,8 @@
sp_sp0_mac: "{{ hostvars['undercloud-client']['port_node_1_sp0_mac'] }}"
sp_sp1_mac: "{{ hostvars['undercloud-client']['port_node_1_sp1_mac'] }}"
ip_node_1_sp_api: "{{ ip_node_1_sp_api }}/24"
- port_node_1_ip_sp0: "{{ port_node_1_ip_sp0 }}/24"
- port_node_1_ip_sp1: "{{ port_node_1_ip_sp1 }}/24"
+ ip_node_1_sp0: "{{ ip_node_1_sp0 }}/24"
+ ip_node_1_sp1: "{{ ip_node_1_sp1 }}/24"
- set_fact:
storpool_netplan: "{{ hostvars['localhost'].STORPOOL_STORPOOL_NETPLAN.v }}"
diff --git a/playbooks/setup-openstack-storpool/vars.yaml b/playbooks/setup-openstack-storpool/vars.yaml
index 2116210..bf810ba 100644
--- a/playbooks/setup-openstack-storpool/vars.yaml
+++ b/playbooks/setup-openstack-storpool/vars.yaml
@@ -8,6 +8,7 @@
openstack_node: "{{ hostvars['controller']['nodepool']['external_id'] }}"
openstack_node_ip: "{{ hostvars['controller']['nodepool']['interface_ip'] }}"
+openstack_node_hostname: "{{ hostvars['controller']['ansible_hostname'] }}"
storpool_volume: "{{ undercloud_client_node }}-storpool-volume"
diff --git a/zuul.d/sp-cinder-secrets.yaml b/zuul.d/sp-cinder-secrets.yaml
index a92b9fc..b69afeb 100644
--- a/zuul.d/sp-cinder-secrets.yaml
+++ b/zuul.d/sp-cinder-secrets.yaml
@@ -42,26 +42,26 @@
name: STORPOOL_CONF_BLOCK
data:
v: !encrypted/pkcs1-oaep
- - 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
+ - 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
- secret:
name: STORPOOL_CONF_ISCSI
@@ -362,16 +362,27 @@
name: STORPOOL_STORPOOL_NETPLAN
data:
v: !encrypted/pkcs1-oaep
- - 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
+ - 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
+
- secret:
name: STORPOOL_NETPLAN_SERVICE