update ansible roles directory for supporting commpass-core installing

BGS-80

Change-Id: I97a5d2a9b1f6c799c1976ec1cf6e687b108e0d0f
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

3 files changed, 0 insertions, 52 deletions

diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml b/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml
deleted file mode 100644
index 9c04d74..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- include: neutron_install.yml
-  tags:
-    - install
-    - neutron_install
-    - neutron 
-
-- include: neutron_config.yml
-  when: HA_CLUSTER is not defined or HA_CLUSTER[inventory_hostname] == ''
-  tags:
-    - config
-    - neutron_config
-    - neutron
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml b/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
deleted file mode 100644
index 77cc29a..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: neutron-db-manage upgrade to Juno
-  shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
-  register: result
-  until: result.rc == 0
-  retries: 5
-  delay: 3
-  notify:
-    - restart neutron-server
-
diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml b/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml
deleted file mode 100644
index 6165299..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: install controller-related neutron packages
-  apt: name={{ item }} state=present force=yes
-  with_items:
-    - neutron-server
-    - neutron-plugin-ml2
-
-- name: generate neutron controll service list
-  shell: echo {{ item }} >> /opt/service
-  with_items:
-    - neutron-server
-    - neutron-plugin-ml2
-
-- name: get tenant id to fill neutron.conf
-  shell: keystone --os-token={{ ADMIN_TOKEN }} --os-endpoint=http://{{ HA_VIP }}:35357/v2.0 tenant-get service | grep id | awk '{print $4}'
-  register: NOVA_ADMIN_TENANT_ID
-
-- name: update neutron conf
-  template: src=neutron.conf dest=/etc/neutron/neutron.conf backup=yes
-  notify:
-    - restart neutron-server
-
-- name: update ml2 plugin conf
-  template: src=ml2_conf.ini dest=/etc/neutron/plugins/ml2/ml2_conf.ini backup=yes
-  notify:
-    - restart neutron-server
-
-- meta: flush_handlers
-