diff --git a/rpc_deployment/inventory/group_vars/nova_all.yml b/rpc_deployment/inventory/group_vars/nova_all.yml index 2aaed5c942..ab202d81ac 100644 --- a/rpc_deployment/inventory/group_vars/nova_all.yml +++ b/rpc_deployment/inventory/group_vars/nova_all.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-all.yml b/rpc_deployment/playbooks/openstack/nova-all.yml index 9d029a622c..cc5df54156 100644 --- a/rpc_deployment/playbooks/openstack/nova-all.yml +++ b/rpc_deployment/playbooks/openstack/nova-all.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-api-ec2.yml b/rpc_deployment/playbooks/openstack/nova-api-ec2.yml index 564d380d4b..fddcfccfa1 100644 --- a/rpc_deployment/playbooks/openstack/nova-api-ec2.yml +++ b/rpc_deployment/playbooks/openstack/nova-api-ec2.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-api-metadata.yml b/rpc_deployment/playbooks/openstack/nova-api-metadata.yml index 2109ac3468..0a2e443492 100644 --- a/rpc_deployment/playbooks/openstack/nova-api-metadata.yml +++ b/rpc_deployment/playbooks/openstack/nova-api-metadata.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-api-os-compute.yml b/rpc_deployment/playbooks/openstack/nova-api-os-compute.yml index 8d8bd97280..8542c35219 100644 --- a/rpc_deployment/playbooks/openstack/nova-api-os-compute.yml +++ b/rpc_deployment/playbooks/openstack/nova-api-os-compute.yml @@ -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: diff --git a/rpc_deployment/playbooks/openstack/nova-cert.yml b/rpc_deployment/playbooks/openstack/nova-cert.yml index c498b42534..1b091b9ce6 100644 --- a/rpc_deployment/playbooks/openstack/nova-cert.yml +++ b/rpc_deployment/playbooks/openstack/nova-cert.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-common.yml b/rpc_deployment/playbooks/openstack/nova-common.yml new file mode 100644 index 0000000000..6682c87010 --- /dev/null +++ b/rpc_deployment/playbooks/openstack/nova-common.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-compute.yml b/rpc_deployment/playbooks/openstack/nova-compute.yml index 51e1958f7a..3cc5b91169 100644 --- a/rpc_deployment/playbooks/openstack/nova-compute.yml +++ b/rpc_deployment/playbooks/openstack/nova-compute.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-conductor.yml b/rpc_deployment/playbooks/openstack/nova-conductor.yml index 7bc3e6e08f..aed4c153cd 100644 --- a/rpc_deployment/playbooks/openstack/nova-conductor.yml +++ b/rpc_deployment/playbooks/openstack/nova-conductor.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-scheduler.yml b/rpc_deployment/playbooks/openstack/nova-scheduler.yml index 32354091b1..1a70060d79 100644 --- a/rpc_deployment/playbooks/openstack/nova-scheduler.yml +++ b/rpc_deployment/playbooks/openstack/nova-scheduler.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/nova-spice-console.yml b/rpc_deployment/playbooks/openstack/nova-spice-console.yml index 14b28b07e1..a1cbdd0a56 100644 --- a/rpc_deployment/playbooks/openstack/nova-spice-console.yml +++ b/rpc_deployment/playbooks/openstack/nova-spice-console.yml @@ -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 diff --git a/rpc_deployment/playbooks/openstack/openstack-common.yml b/rpc_deployment/playbooks/openstack/openstack-common.yml index a9430bb934..b2b0b4b21c 100644 --- a/rpc_deployment/playbooks/openstack/openstack-common.yml +++ b/rpc_deployment/playbooks/openstack/openstack-common.yml @@ -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 diff --git a/rpc_deployment/roles/openstack_common/tasks/main.yml b/rpc_deployment/roles/openstack_common/tasks/main.yml index 010db6839f..74a211a3b6 100644 --- a/rpc_deployment/roles/openstack_common/tasks/main.yml +++ b/rpc_deployment/roles/openstack_common/tasks/main.yml @@ -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