converted nova to use repo_packages

This commit is contained in:
Kevin Carter 2014-09-30 15:20:02 -05:00
parent adab7e62a1
commit c467afa351
13 changed files with 38 additions and 86 deletions

View File

@ -86,22 +86,6 @@ nova_scheduler_manager: nova.scheduler.manager.SchedulerManager
nova_scheduler_max_attempts: 5
nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers
## Git Source
## ALL of this has been relocated to vars/repo_packages
## TODO(someone) this should be removed once the repo bits are all figured out.
git_repo: https://git.openstack.org/openstack/nova
git_fallback_repo: https://github.com/openstack/nova
git_etc_example: etc/nova/
git_install_branch: master
service_pip_dependencies:
- MySQL-python
- python-memcached
- pycrypto
- python-keystoneclient
- python-novaclient
- keystonemiddleware
container_directories:
- /var/log/nova
- /var/lib/nova
@ -111,9 +95,3 @@ container_directories:
- /var/cache/nova
- /var/lock/nova
- /var/run/nova
container_packages:
- libpq-dev
- open-iscsi
- vlan
- kpartx

View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: nova-common.yml
- include: nova-api-os-compute.yml
- include: nova-api-ec2.yml
- include: nova-api-metadata.yml

View File

@ -30,13 +30,7 @@
- hosts: nova_api_ec2
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml

View File

@ -16,13 +16,7 @@
- hosts: nova_api_metadata
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml

View File

@ -13,18 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- hosts: nova_all
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- galera_client_cnf
vars_files:
- inventory/group_vars/nova_all.yml
- hosts: nova_api_os_compute[0]
user: root
roles:

View File

@ -16,13 +16,7 @@
- hosts: nova_cert
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml

View File

@ -0,0 +1,27 @@
---
# Copyright 2014, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- hosts: nova_all
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- galera_client_cnf
vars_files:
- inventory/group_vars/nova_all.yml
- vars/repo_packages/nova.yml

View File

@ -21,20 +21,15 @@
- hosts: nova_compute
user: root
roles:
- common
- common_sudoers
- container_extra_setup
- neutron_add_network_interfaces
- container_common
- openstack_common
- openstack_openrc
- nova_compute_devices
- nova_common
- nova_libvirt
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml
- vars/repo_packages/nova_libvirt.yml
- vars/config_vars/container_config_nova_compute.yml
- vars/openstack_service_vars/nova_compute.yml
- vars/openstack_service_vars/nova_spice_console_endpoint.yml

View File

@ -16,13 +16,7 @@
- hosts: nova_conductor
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml

View File

@ -16,13 +16,7 @@
- hosts: nova_scheduler
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml

View File

@ -16,13 +16,7 @@
- hosts: nova_spice_console
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- inventory/group_vars/nova_all.yml
@ -34,13 +28,7 @@
- hosts: nova_spice_console
user: root
roles:
- common
- common_sudoers
- container_common
- openstack_common
- openstack_openrc
- nova_common
- galera_client_cnf
- init_script
vars_files:
- vars/openstack_service_vars/nova_console_auth.yml

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- hosts: glance_all:heat_all:nova_all:cinder_all
- hosts: glance_all:heat_all:cinder_all
user: root
roles:
- common

View File

@ -18,7 +18,12 @@
# TODO(kevin) This should go away sooner than later
- name: Laydown the example files
shell: >
chdir="/opt/{{ service_name }}_{{ git_install_branch | replace('/', '_') }}/{{ git_etc_example }}"
for i in *; do if [ ! -f "/etc/{{ service_name }}/$i" ]; then cp -R $i /etc/{{ service_name }}/; fi; done;
shell: |
for i in *; do
if [ ! -f "/etc/{{ service_name }}/$i" ]; then
cp -R $i /etc/{{ service_name }}/
fi
done
args:
chdir: "/opt/{{ service_name }}_{{ git_install_branch | replace('/', '_') }}/{{ git_etc_example }}"
when: git_etc_example is defined