Remove obsoleted code

JIRA:-

use OpenStack-ansible deploy openstack, so remove obsoleted code.
Some of the enhanced features will be added in later versions

Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3
Signed-off-by: chigang <chigang@huawei.com>

7 files changed, 0 insertions, 272 deletions

diff --git a/deploy/adapters/ansible/roles/nova-compute/handlers/main.yml b/deploy/adapters/ansible/roles/nova-compute/handlers/main.yml
deleted file mode 100644
index cbf0bc1c..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/handlers/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-- name: restart nova-compute services
-  service: name={{ item }} state=restarted enabled=yes
-  with_items: "{{ services | union(services_noarch) }}"
diff --git a/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml b/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml
deleted file mode 100644
index 7842a73c..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-- include_vars: "{{ ansible_os_family }}.yml"
-
-- name: disable auto start
-  copy:
-    content: "#!/bin/sh\nexit 101"
-    dest: "/usr/sbin/policy-rc.d"
-    mode: 0755
-  when: ansible_os_family == "Debian"
-
-- name: install nova-compute related packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: "{{ packages | union(packages_noarch) }}"
-
-- name: restart virtlogd
-  service: name=virtlogd state=started enabled=yes
-  when: ansible_os_family == "Debian"
-
-- name: enable auto start
-  file:
-    path=/usr/sbin/policy-rc.d
-    state=absent
-  when: ansible_os_family == "Debian"
-
-- name: get number of cpu support virtualization
-  shell: egrep -c '(vmx|svm)' /proc/cpuinfo || echo 0
-  register: kvm_cpu_num
-
-- name: update libvirt-bin conf
-  lineinfile:
-    dest: /etc/default/libvirt-bin
-    regexp: '^libvirtd_opts=.*'
-    insertafter: '^#libvirtd_opts=.*'
-    line: 'libvirtd_opts="-d -l"'
-  when: ansible_os_family == "Debian"
-  notify:
-    - restart nova-compute services
-
-- name: update libvirt-bin.conf
-  lineinfile:
-    dest: /etc/init/libvirt-bin.conf
-    regexp: '^env libvirtd_opts=.*'
-    line: 'env libvirtd_opts="-d -l"'
-  when: ansible_os_family == "Debian"
-  notify:
-    - restart nova-compute services
-
-- name: update libvirtd.conf
-  lineinfile:
-    dest: /etc/libvirt/libvirtd.conf
-    regexp: '{{ item.regexp }}'
-    insertafter: '{{ item.insertafter }}'
-    line: '{{ item.line }}'
-  with_items:
-    - regexp: '^listen_tls.*'
-      insertafter: '^#listen_tls.*'
-      line: 'listen_tls = 0'
-    - regexp: '^listen_tcp.*'
-      insertafter: '^#listen_tcp.*'
-      line: 'listen_tcp = 1'
-    - regexp: '^auth_tcp.*'
-      insertafter: '^#auth_tcp.*'
-      line: 'auth_tcp = "none"'
-  notify:
-    - restart nova-compute services
-
-- name: update sysconfig libvirtd
-  lineinfile:
-    dest: /etc/sysconfig/libvirtd
-    regexp: '^LIBVIRTD_ARGS.*'
-    insertafter: '^#LIBVIRTD_ARGS.*'
-    line: 'LIBVIRTD_ARGS="--listen"'
-  when: ansible_os_family == "RedHat"
-  notify:
-    - restart nova-compute services
-
-- name: update nova-compute conf
-  template: src={{ item }} dest=/etc/nova/{{ item }}
-  with_items:
-    - nova.conf
-    - nova-compute.conf
-  notify:
-    - restart nova-compute services
-
-- name: generate neutron control service list
-  lineinfile: dest=/opt/service create=yes line='{{ item }}'
-  with_items: "{{ services | union(services_noarch) }}"
-
-- name: remove nova sqlite db
-  shell: rm /var/lib/nova/nova.sqlite || touch nova.sqlite.removed
-
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/nova-compute/templates/nova-compute.conf b/deploy/adapters/ansible/roles/nova-compute/templates/nova-compute.conf
deleted file mode 100644
index a46c6b8d..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/templates/nova-compute.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-compute_driver = libvirt.LibvirtDriver
-force_raw_images = true
-[libvirt]
-cpu_mode = none
-{% if kvm_cpu_num.stdout_lines[0]|int == 0 %}
-virt_type = qemu
-{% else %}
-virt_type = kvm
-{% endif %}
-images_type = raw
-mem_stats_period_seconds = 0
diff --git a/deploy/adapters/ansible/roles/nova-compute/templates/nova.conf b/deploy/adapters/ansible/roles/nova-compute/templates/nova.conf
deleted file mode 100644
index 8d7e9a5f..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/templates/nova.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-[DEFAULT]
-transport_url = rabbit://{{ RABBIT_USER }}:{{ RABBIT_PASS }}@{{ rabbit_host }}
-auth_strategy = keystone
-my_ip = {{ internal_ip }}
-use_neutron = True
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
-
-dhcpbridge_flagfile=/etc/nova/nova.conf
-dhcpbridge=/usr/bin/nova-dhcpbridge
-log-dir=/var/log/nova
-state_path=/var/lib/nova
-force_dhcp_release=True
-verbose={{ VERBOSE }}
-ec2_private_dns_show_ip=True
-enabled_apis=osapi_compute,metadata
-default_floating_pool={{ public_net_info.network }}
-metadata_listen={{ internal_ip }}
-linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
-iscsi_helper=tgtadm
-connection_type=libvirt
-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-debug={{ DEBUG }}
-volumes_path=/var/lib/nova/volumes
-rpc_backend = rabbit
-osapi_compute_listen={{ internal_ip }}
-network_api_class = nova.network.neutronv2.api.API
-security_group_api = neutron
-instance_usage_audit = True
-instance_usage_audit_period = hour
-notify_on_state_change = vm_and_task_state
-notification_driver = nova.openstack.common.notifier.rpc_notifier
-notification_driver = ceilometer.compute.nova_notifier
-
-[api_database]
-connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova_api
-idle_timeout = 30
-pool_timeout = 10
-use_db_reconnect = True
-
-[database]
-connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova
-idle_timeout = 30
-pool_timeout = 10
-use_db_reconnect = True
-
-[glance]
-api_servers = http://{{ internal_vip.ip }}:9292
-host = {{ internal_vip.ip }}
-
-[keystone_authtoken]
-auth_uri = http://{{ internal_vip.ip }}:5000
-auth_url = http://{{ internal_vip.ip }}:35357
-auth_type = password
-project_domain_name = default
-user_domain_name = default
-project_name = service
-username = nova
-password = {{ NOVA_PASS }}
-
-identity_uri = http://{{ internal_vip.ip }}:35357
-admin_tenant_name = service
-admin_user = nova
-admin_password = {{ NOVA_PASS }}
-
-[libvirt]
-use_virtio_for_bridges=True
-
-[neutron]
-url = http://{{ internal_vip.ip }}:9696
-auth_url = http://{{ internal_vip.ip }}:35357
-auth_type = password
-project_domain_name = default
-user_domain_name = default
-region_name = RegionOne
-project_name = service
-username = neutron
-password = {{ NEUTRON_PASS }}
-service_metadata_proxy = True
-metadata_proxy_shared_secret = {{ METADATA_SECRET }}
-
-auth_strategy = keystone
-admin_tenant_name = service
-admin_username = neutron
-admin_password = {{ NEUTRON_PASS }}
-admin_auth_url = http://{{ internal_vip.ip }}:35357/v3
-
-[oslo_concurrency]
-lock_path=/var/lib/nova/tmp
-
-[oslo_messaging_rabbit]
-rabbit_host = {{ rabbit_host }}
-rabbit_userid = {{ RABBIT_USER }}
-rabbit_password = {{ RABBIT_PASS }}
-
-[vnc]
-enabled = True
-vncserver_listen = {{ internal_ip }}
-vncserver_proxyclient_address = {{ internal_ip }}
-novncproxy_base_url = http://{{ public_vip.ip }}:6080/vnc_auto.html
-novncproxy_host = {{ internal_ip }}
-novncproxy_port = 6080
-
-[wsgi]
-api_paste_config=/etc/nova/api-paste.ini
diff --git a/deploy/adapters/ansible/roles/nova-compute/vars/Debian.yml b/deploy/adapters/ansible/roles/nova-compute/vars/Debian.yml
deleted file mode 100644
index 4e599500..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/vars/Debian.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-
-packages:
-  - nova-compute-kvm
-
-services:
-  - nova-compute
-  - libvirt-bin
diff --git a/deploy/adapters/ansible/roles/nova-compute/vars/RedHat.yml b/deploy/adapters/ansible/roles/nova-compute/vars/RedHat.yml
deleted file mode 100644
index dab2cfdc..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/vars/RedHat.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-packages:
-  - openstack-nova-compute
-  - sysfsutils
-
-services:
-  - libvirtd
-  - openstack-nova-compute
diff --git a/deploy/adapters/ansible/roles/nova-compute/vars/main.yml b/deploy/adapters/ansible/roles/nova-compute/vars/main.yml
deleted file mode 100644
index f6fef749..00000000
--- a/deploy/adapters/ansible/roles/nova-compute/vars/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-packages_noarch: []
-
-services_noarch: []