bugfix: OpenContrail Script

JIRA: COMPASS-185

Change-Id: I43dd4b223fa812c3c4b484281fe85b532ef1e789
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

2 files changed, 45 insertions, 37 deletions

diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml
index 94b41557..2a0e2709 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml
@@ -7,9 +7,9 @@
   when: groups['opencontrail_control']|length !=0
   # Compass install OpenStack with not only OpenContrail but also ODL or ONOS, and sometimes user just installs OpenStack, so item 'opencontrail_control' is kind of a mark that whether Compass install OpenContrail or not.
 
-- name: Install kernal on all hosts for Open Contrail
-  include: install/install-kernal.yml
-  when: groups['opencontrail_control']|length !=0
+#- name: Install kernal on all hosts for Open Contrail
+#  include: install/install-kernel.yml
+#  when: groups['opencontrail_control']|length !=0
 
 - name: Install database for Open Contrail
   include: install/install-database.yml
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml
index 8245c046..f4ad05cb 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml
@@ -1,39 +1,47 @@
 ---
-- hosts: config
-  sudo: yes
-  tasks:
-    - name: "provision config node"
-      shell: "python /opt/contrail/utils/provision_config_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+#- hosts: config
+#  sudo: yes
+#  tasks:
+- name: "provision config node"
+  shell: "python /opt/contrail/utils/provision_config_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+  when: inventory_hostname in groups['opencontrail_config']
 
-- hosts: database
-  sudo: yes
-  tasks:
-    - name: "provision database node"
-      shell: "python /opt/contrail/utils/provision_database_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+#- hosts: database
+#  sudo: yes
+#  tasks:
+- name: "provision database node"
+  shell: "python /opt/contrail/utils/provision_database_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+  when: inventory_hostname in groups['opencontrail_database']
+  
+  
+#- hosts: collector
+#  sudo: yes
+#  tasks:
+- name: "provision collector node"
+  shell: "python /opt/contrail/utils/provision_analytics_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+  when: inventory_hostname in groups['opencontrail_collector']
 
-- hosts: collector
-  sudo: yes
-  tasks:
-    - name: "provision collector node"
-      shell: "python /opt/contrail/utils/provision_analytics_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+#- hosts: control
+#  sudo: yes
+#  tasks:
+- name: "provision control node"
+  shell: "python /opt/contrail/utils/provision_control.py --api_server_ip {{ contrail_haproxy_address }} --api_server_port 8082 --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }} --router_asn {{ contrail_router_asn }}"
+  when: inventory_hostname in groups['opencontrail_control']
+  
+#- hosts: config
+#  sudo: yes
+#  tasks:
+- name: "provision metadata services"
+  shell: "python /opt/contrail/utils/provision_linklocal.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --ipfabric_service_ip 10.84.50.1 --ipfabric_service_port 8775 --linklocal_service_name metadata --linklocal_service_ip 169.254.169.254 --linklocal_service_port 80"
+  run_once: yes
+  when: inventory_hostname in groups['opencontrail_config']
 
-- hosts: control
-  sudo: yes
-  tasks:
-    - name: "provision control node"
-      shell: "python /opt/contrail/utils/provision_control.py --api_server_ip {{ contrail_haproxy_address }} --api_server_port 8082 --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }} --router_asn {{ contrail_router_asn }}"
 
-- hosts: config
-  sudo: yes
-  tasks:
-    - name: "provision metadata services"
-      shell: "python /opt/contrail/utils/provision_linklocal.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --ipfabric_service_ip 10.84.50.1 --ipfabric_service_port 8775 --linklocal_service_name metadata --linklocal_service_ip 169.254.169.254 --linklocal_service_port 80"
-      run_once: yes
-    
-
-- hosts: config
-  sudo: yes
-  tasks:
-    - name: "provision encap"
-      shell: "python /opt/contrail/utils/provision_encap.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --oper add --encap_priority MPLSoUDP,MPLSoGRE,VXLAN"
-      run_once: yes
+#- hosts: config
+#  sudo: yes
+#  tasks:
+- name: "provision encap"
+  shell: "python /opt/contrail/utils/provision_encap.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --oper add --encap_priority MPLSoUDP,MPLSoGRE,VXLAN"
+  run_once: yes
+  when: inventory_hostname in groups['opencontrail_config']
+  
\ No newline at end of file