diff options
author | chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-18 10:05:58 +0800 |
---|---|---|
committer | shuai chen <chenshuai@huawei.com> | 2016-01-21 14:49:30 +0000 |
commit | d81783305d2837eb2d76f8f3098bd06f2b58a5d2 (patch) | |
tree | fec57a0b7b505066229eb2aca706b0eb36929cd6 /deploy/adapters/ansible/roles/open-contrail/tasks/install | |
parent | 9e1a57ca0b97e49813ae6c19dab7e12c21721717 (diff) |
bugfix: opencontrail automation deployment scripts
JIRA: COMPASS-277
Change-Id: Ia1f52c6e8e3de520cf06de99550c17879aaed2d7
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit 77944ac2791a631cfa785d16cc32dae8082b2719)
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/install')
-rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml | 20 | ||||
-rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml | 26 |
2 files changed, 25 insertions, 21 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml index 17163fca..f2940215 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml @@ -19,20 +19,20 @@ ############################################### ################ workaround ################# ############################################### -#- name: "backup keepalived conf" -# shell: mv /etc/keepalived/keepalived.conf /home/keepalived.conf +- name: "backup keepalived conf" + shell: mv /etc/keepalived/keepalived.conf /home/keepalived.conf -#- name: "uninstall keepalived" -# action: "{{ ansible_pkg_mgr }} name=keepalived state=absent" +- name: "uninstall keepalived" + action: "{{ ansible_pkg_mgr }} name=keepalived state=absent" -#- name: "install iproute" -# action: "{{ ansible_pkg_mgr }} name=iproute state=present" +- name: "install iproute" + action: "{{ ansible_pkg_mgr }} name=iproute state=present" -#- name: "install iproute" -# action: "{{ ansible_pkg_mgr }} name=keepalived state=present" +- name: "install iproute" + action: "{{ ansible_pkg_mgr }} name=keepalived state=present" -#- name: "restore keepalived conf" -# shell: mv /home/keepalived.conf /etc/keepalived/keepalived.conf +- name: "restore keepalived conf" + shell: mv /home/keepalived.conf /etc/keepalived/keepalived.conf ############################################### - name: "install contrail openstack config package" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml index 4f21d50a..bf313e52 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml @@ -2,20 +2,24 @@ #- hosts: all # sudo: yes # tasks: -- name: "configure interface" -# sudo: True - lineinfile: - dest: "/etc/network/interfaces" - line: "{{ item }}" - with_items: - - "auto {{ contrail_vhost_device }}" - - "iface {{ contrail_vhost_device }} inet static" - - "\taddress {{ contrail_vhost_address }}" - - "\tnetmask {{ contrail_vhost_netmask }}" +- name: get last ip address + shell: expr substr `cat /etc/hostname` 5 1 + register: lastip + +#- name: "configure interface" +## sudo: True +# lineinfile: +# dest: "/etc/network/interfaces" +# line: "{{ item }}" +# with_items: +# - "auto {{ contrail_vhost_device }}" +# - "iface {{ contrail_vhost_device }} inet static" +# - "\taddress {{ contrail_vhost_address }}{{ lastip.stdout_lines[0] }}" +# - "\tnetmask {{ contrail_vhost_netmask }}" - name: "set interface address" # sudo: True - shell: "ifconfig {{ contrail_vhost_device }} {{ contrail_vhost_address }} netmask {{ contrail_vhost_netmask }}" + shell: "ifconfig {{ contrail_vhost_device }} {{ contrail_vhost_address }}{{ lastip.stdout_lines[0] }} netmask {{ contrail_vhost_netmask }}" - name: "up interface" # sudo: True |