diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks')
5 files changed, 77 insertions, 0 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 dbd542be..17163fca 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 @@ -16,6 +16,25 @@ src: "../../templates/install/override.j2" dest: "/etc/init/neutron-server.override" +############################################### +################ workaround ################# +############################################### +#- 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: "install iproute" +# action: "{{ ansible_pkg_mgr }} name=iproute 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: "install contrail openstack config package" # sudo: True # apt: diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml index d2c69600..2544b0ff 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml @@ -2,6 +2,11 @@ - include_vars: "{{ ansible_os_family }}.yml" +- name: Disable Service Daemon + template: + src: "/opt/service" + dest: "/opt/service.backup" + - name: Install common on all hosts for Open Contrail include: install/install-common.yml when: groups['opencontrail_control']|length !=0 @@ -97,6 +102,10 @@ include: provision/provision-compute.yml when: inventory_hostname in groups['opencontrail_compute'] +- name: Enable Service Daemon + template: + src: "/opt/service.backup" + dest: "/opt/service" #- name: Provision tsn for Open Contrail # include: provision/provision-tsn.yml diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/.provision-compute.yml.swp b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/.provision-compute.yml.swp Binary files differnew file mode 100644 index 00000000..41980448 --- /dev/null +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/.provision-compute.yml.swp diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml index 4fbff0b7..c8db15b6 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml @@ -165,6 +165,32 @@ with_items: - { section: "DEFAULT", option: "network_api_class", value: "nova_contrail_vif.contrailvif.ContrailNetworkAPI" } + + +################################################# +########### nova plugin workaround ############ +################################################# + +- name: "copy nova plugs on compute" + template: + src: "nova_contrail_vif.tar.gz" + dest: "/opt/nova_contrail_vif.tar.gz" + +- name: "unzip nova plugs" + command: su -s /bin/sh -c "tar xzf /opt/nova_contrail_vif.tar.gz -C /opt/" + +- name: "remove original nova plugs" + shell: rm -rf /usr/lib/python2.7/dist-packages/nova_contrail_vif/ + +- name: "use new neutron plugs" + shell: mv /opt/nova_contrail_vif/ /usr/lib/python2.7/dist-packages/nova_contrail_vif/ + +################################################# + + + + + - name: "restart nova compute" service: name: "nova-compute" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml index 943214fd..99a18dba 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml @@ -229,6 +229,29 @@ state: "restarted" + +########################################################### +############# neutron plugins workaround ################## +########################################################### + +- name: "copy neutron plugs on controller" + template: + src: "neutron_plugin_contrail.tar.gz" + dest: "/opt/neutron_plugin_contrail.tar.gz" + +- name: "unzip neutron plugs" + command: su -s /bin/sh -c "tar xzf /opt/neutron_plugin_contrail.tar.gz -C /opt/" + +- name: "remove original neutron plugs" + shell: rm -rf /usr/lib/python2.7/dist-packages/neutron_plugin_contrail/ + +- name: "use new neutron plugs" + shell: mv /opt/neutron_plugin_contrail/ /usr/lib/python2.7/dist-packages/neutron_plugin_contrail/ + +########################################################### + + + - name: "restart neutron-server" service: name: "neutron-server" |