diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-07-25 17:01:04 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-08-11 15:06:29 +0800 |
| commit | 02708db0054bcabf4db151d4b364d70ecc44ef18 (patch) | |
| tree | 927dca85b79e918ce30d1f96f6c8bd09079777fa /deploy/adapters/ansible/roles/config-osa/templates | |
| parent | 58f021096b8c7969bcbbc9e06934f0718b71a2b9 (diff) | |
Adapt network.yml to OpenStack Ansible
JIRA:COMPASS-557
1. modify sys_intf_mappings and ip_settings in
network.yml to synchronize with OSA network.
networks compass build will be mgmt, external,
tenant, storage.
2. modify compass_conf to support new netwok.yml
3. fix some hard coding when transfer ip parameters
4. support heterogeneous network
Change-Id: Ib4a8af1f96a40e6456242e3dc2b456e0c8c17c2e
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa/templates')
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2 | 31 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 | 4 |
2 files changed, 20 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2 index 2a24113b..d69674f2 100644 --- a/deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2 +++ b/deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2 @@ -1,20 +1,25 @@ --- cidr_networks: - container: 10.1.0.0/24 - tunnel: 172.29.240.0/22 - storage: 172.16.2.0/24 + container: {{ mgmt_cidr }} + tunnel: {{ tenant_cidr }} + storage: {{ storage_cidr }} used_ips: - - "10.1.0.1,10.1.0.55" - - "10.1.0.100,10.1.0.110" - - "172.29.240.1,172.29.240.50" - - "172.16.2.1,172.16.2.50" - - "172.29.248.1,172.29.248.50" +{% for item in network_cfg["ip_settings"] %} + - "{{ ','.join(item["ip_ranges"][0]) }}" +{% if item["name"] == "mgmt" %} + - "{{ ','.join(item["dhcp_ranges"][0]) }}" +{% endif %} +{% if "gw" in item %} + - "{{ item["gw"] }}" +{% endif %} +{% endfor %} + - "{{ internal_vip.ip }}" global_overrides: - internal_lb_vip_address: 10.1.0.22 + internal_lb_vip_address: {{ internal_vip.ip }} external_lb_vip_address: {{ public_vip.ip }} - tunnel_bridge: "br-vxlan" + tunnel_bridge: "br-tenant" management_bridge: "br-mgmt" provider_networks: - network: @@ -29,7 +34,7 @@ global_overrides: is_container_address: true is_ssh_address: true - network: - container_bridge: "br-vxlan" + container_bridge: "br-tenant" container_type: "veth" container_interface: "eth10" ip_from_q: "tunnel" @@ -43,7 +48,7 @@ global_overrides: - neutron_openvswitch_agent {% endif %} - network: - container_bridge: "br-vlan" + container_bridge: "br-external" container_type: "veth" container_interface: "eth12" host_bind_override: "eth12" @@ -56,7 +61,7 @@ global_overrides: - neutron_openvswitch_agent {% endif %} - network: - container_bridge: "br-vlan" + container_bridge: "br-external" container_type: "veth" container_interface: "eth11" type: "vlan" diff --git a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 index 7f29d5fe..2b4a959a 100644 --- a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 +++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 @@ -22,8 +22,8 @@ debug: false haproxy_keepalived_external_vip_cidr: "{{ public_vip.ip }}/32" -haproxy_keepalived_internal_vip_cidr: "10.1.0.22/32" -haproxy_keepalived_external_interface: br-vlan +haproxy_keepalived_internal_vip_cidr: "{{ internal_vip.ip }}/32" +haproxy_keepalived_external_interface: br-external haproxy_keepalived_internal_interface: br-mgmt keepalived_ping_address: "{{ ntp_server }}" |