openstack/openstack-ansible
Code Issues Proposed changes

Merge "Allow openstack healthcheck and tempest to co-exist"

Browse Source
This commit is contained in:
Zuul 2018-09-04 16:00:08 +00:00 committed by Gerrit Code Review
commit f36835adf2
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
playbooks/defaults/healthchecks-vars.yml
View File

@ -26,42 +26,36 @@ cinder_volumes:
- name: healthcheck1 - name: healthcheck1
size: 1 size: 1
public_net_cidr: "172.29.248.0/22" public_net_cidr: "{{ tempest_public_subnet_cidr | default('10.1.13.0/24') }}"
private_net_cidr: "192.168.0.0/24" private_net_cidr: "{{ tempest_private_subnet_cidr | default('192.168.74.0/28') }}"
public_dns_servers: public_dns_servers:
- "8.8.8.8" - "8.8.8.8"
- "8.8.4.4" - "8.8.4.4"
neutron_networks: neutron_networks:
public: public:
name: public name: "{{ tempest_public_net_name | default('public') }}"
shared: True shared: True
external: True external: True
pn_type: flat pn_type: "{{ tempest_public_net_provider_type | default('flat') }}"
physical_network: flat physical_network: "{{ tempest_public_net_physical_type | default('flat') }}"
subnets: subnets:
- name: public-subnet - name: "{{ tempest_public_subnet_name | default('public-subnet') }}"
ip_version: 4 ip_version: 4
cidr: "{{ public_net_cidr }}" cidr: "{{ public_net_cidr }}"
gateway_ip: "{{ public_net_cidr | ipaddr('1') | ipaddr('address') }}"
enable_dhcp: "yes" enable_dhcp: "yes"
allocation_pool_start: "{{ public_net_cidr | ipaddr('201') | ipaddr('address') }}"
allocation_pool_end: "{{ public_net_cidr | ipaddr('255') | ipaddr('address') }}"
dns_nameservers: "{{ public_dns_servers }}" dns_nameservers: "{{ public_dns_servers }}"
private: private:
name: PRIVATE_NET name: "{{ tempest_private_net_name | default('private') }}"
shared: True shared: True
external: True external: True
pn_type: vxlan pn_type: "{{ tempest_private_net_provider_type | default('vxlan') }}"
segmentation_id: 101 segmentation_id: "{{ tempest_private_net_seg_id | default('1') }}"
subnets: subnets:
- name: PRIVATE_NET_v4 - name: "{{ tempest_private_subnet_name | default('private-subnet') }}"
ip_version: 4 ip_version: 4
cidr: "{{ private_net_cidr }}" cidr: "{{ private_net_cidr }}"
gateway_ip: "{{ private_net_cidr | ipaddr('1') | ipaddr('address') }}"
enable_dhcp: "yes" enable_dhcp: "yes"
allocation_pool_start: "{{ private_net_cidr | ipaddr('201') | ipaddr('address') }}"
allocation_pool_end: "{{ private_net_cidr | ipaddr('254') | ipaddr('address') }}"
heat_stack: heat_stack:
# Please use the following for a nova app: # Please use the following for a nova app:
@ -87,7 +81,7 @@ nova_vm:
name: vm1-healthcheck name: vm1-healthcheck
image: cirros-healthcheck image: cirros-healthcheck
flavor: healthcheck1 flavor: healthcheck1
network: "PRIVATE_NET" network: "{{ neutron_networks.private.name }}"
swift_object: swift_object:
name: fstab name: fstab

2
playbooks/healthcheck-openstack.yml
View File

@ -327,7 +327,7 @@
set_fact: set_fact:
_floating_ip: "{{ openstack_servers | json_query(_query) }}" _floating_ip: "{{ openstack_servers | json_query(_query) }}"
vars: vars:
_query: "[?name == '{{ nova_vm.name }}'].addresses.PRIVATE_NET[] | [?contains(*,'floating')].addr" _query: "[?name == '{{ nova_vm.name }}'].addresses.{{ nova_vm.network }}[] | [?contains(*,'floating')].addr"
- name: Ensure connection to node works - name: Ensure connection to node works
command: "scp -o StrictHostKeyChecking=no -i {{ ssh_key }} cirros@{{ _floating_ip[0] }}:/etc/fstab /tmp/fstab" command: "scp -o StrictHostKeyChecking=no -i {{ ssh_key }} cirros@{{ _floating_ip[0] }}:/etc/fstab /tmp/fstab"