From acab17c36763b7679a6d761f438412e591347902 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Thu, 7 Sep 2017 17:28:47 +0800 Subject: from controller node fetch os_cert Change-Id: I2d1cbc6948d2cea1ccb852ed23033d5ddc6393e4 Signed-off-by: wutianwei --- deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 4 +++- deploy/adapters/ansible/roles/post-openstack/tasks/main.yml | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 741c5bf1..e1efebfa 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -69,7 +69,9 @@ tags: - odl -- hosts: utility_all[0] +- hosts: + - utility_all[0] + - network_hosts[0] remote_user: root roles: - post-openstack diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml index 4e2da1e0..7022a4b5 100644 --- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml +++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml @@ -16,6 +16,7 @@ when: - public_net_info.enable == "True" - public_net_info.type == "flat" + - inventory_hostname == groups['utility_all'][0] - name: create external net shell: | @@ -27,6 +28,7 @@ when: - public_net_info.enable == "True" - public_net_info.type == "vlan" + - inventory_hostname == groups['utility_all'][0] - name: create external subnet shell: | @@ -37,6 +39,8 @@ --gateway "{{ public_net_info.external_gw }}" \ --subnet-range "{{ public_net_info.floating_ip_cidr }}" \ "{{ public_net_info.subnet }}" + when: + - inventory_hostname == groups['utility_all'][0] - name: create openstack flavors shell: | @@ -45,15 +49,22 @@ --id {{ item.id }} --ram {{ item.ram }} \ --disk {{ item.disk }} --vcpus {{ item.vcpus }} || true with_items: "{{ flavors }}" + when: + - inventory_hostname == groups['utility_all'][0] + - name: fetch openrc fetch: src: /root/openrc dest: /opt/openrc flat: "yes" + when: + - inventory_hostname == groups['utility_all'][0] - name: fetch haproxy.cert fetch: src: /etc/ssl/certs/haproxy.cert dest: /opt/os_cacert flat: "yes" + when: + - inventory_hostname == groups['network_hosts'][0] -- cgit 1.2.3-korg