aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j22
-rw-r--r--deploy/adapters/ansible/roles/process-openrc/tasks/main.yml6
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml7
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml18
4 files changed, 33 insertions, 0 deletions
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 03e3a2af..4f1ea8d5 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
@@ -71,3 +71,5 @@ security_sshd_permit_root_login: yes
security_ntp_servers:
- {{ ntp_server }}
+
+tacker_etc_dir: "/etc/tacker"
diff --git a/deploy/adapters/ansible/roles/process-openrc/tasks/main.yml b/deploy/adapters/ansible/roles/process-openrc/tasks/main.yml
index aed68b88..d8de1b2d 100644
--- a/deploy/adapters/ansible/roles/process-openrc/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/process-openrc/tasks/main.yml
@@ -24,3 +24,9 @@
dest: /opt/openrc
regexp: "internalURL"
replace: "publicURL"
+
+- name: add the IP of SDN controller
+ lineinfile:
+ dest: /opt/openrc
+ state: present
+ line: "export SDN_CONTROLLER_IP={{ public_vip['ip'] }}"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml
index c4451ca2..1eb68871 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml
@@ -26,3 +26,10 @@
become: "yes"
become_user: "neutron"
when: odl_sfc == "Enable"
+
+- name: fetch ml2_conf.ini to compass-tasks
+ fetch:
+ src: /etc/neutron/plugins/ml2/ml2_conf.ini
+ dest: /tmp/
+ flat: "yes"
+ when: odl_sfc == "Enable"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml
index 9f1cb79e..55b0e160 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml
@@ -32,3 +32,21 @@
- name: restart opendaylight
shell: sleep 60; service opendaylight restart; sleep 60;
when: inventory_hostname in groups['network_hosts']
+
+- name: creat ml2 directory on ODL hosts
+ file:
+ path: /etc/neutron/plugins/ml2/
+ state: directory
+ mode: 0755
+ when:
+ - inventory_hostname in groups['network_hosts']
+ - odl_sfc == "Enable"
+
+- name: copy ml2_conf.ini to ODL hosts
+ copy:
+ src: /tmp/ml2_conf.ini
+ dest: /etc/neutron/plugins/ml2/ml2_conf.ini
+ mode: 0755
+ when:
+ - inventory_hostname in groups['network_hosts']
+ - odl_sfc == "Enable"