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/post-openstack | |
| 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/post-openstack')
| -rw-r--r-- | deploy/adapters/ansible/roles/post-openstack/tasks/main.yml | 4 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/post-openstack/vars/main.yml | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml index 10d8f727..6a8299d6 100644 --- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml +++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml @@ -31,8 +31,8 @@ - name: replace internalURL with publicURL in openrc replace: dest: /opt/openrc - regexp: "{{internal_vip}}" - replace: "{{ public_vip['ip']}}" + regexp: "{{ internal_vip['ip'] }}" + replace: "{{ public_vip['ip'] }}" - name: change the endpoint type replace: diff --git a/deploy/adapters/ansible/roles/post-openstack/vars/main.yml b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml index 19d9e225..d9c36d42 100644 --- a/deploy/adapters/ansible/roles/post-openstack/vars/main.yml +++ b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml @@ -7,7 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -internal_vip: "10.1.0.22" flavors: - id: 0 name: m1.nano |