Minor fix in OpenDaylight playbook

'configure nova' should run on compute nodes only. Change-Id: I6647ae74279592e4719ef0d3b0e0e106b49bdfaa
redhat-openstack · Jul 17, 2016 · f2169c4 · f2169c4
1 parent 2d639e0
commit f2169c4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/playbooks/post-deploy/packstack/opendaylight/configure_nova.yml b/playbooks/post-deploy/packstack/opendaylight/configure_nova.yml
@@ -1,5 +1,5 @@
 - name: Configure nova
-  hosts: controller
+  hosts: compute
   sudo: yes
   tasks:
     - name: Set force_config_drive

diff --git a/playbooks/post-deploy/packstack/opendaylight/start_services.yml b/playbooks/post-deploy/packstack/opendaylight/start_services.yml
@@ -23,55 +23,57 @@
             sudo ovs-vsctl --no-wait -- --may-exist add-port br-ex eth2;
             sudo ip link set eth2 up
 
-- name: Post odl-installation steps
+- name: Post odl-installation controller steps
   hosts: controller
   sudo: yes
   tasks:
-      - name: Start neutron services
+      - name: Start neutron and nova services
         service: name={{ item }}
                  state=running
         with_items:
           - 'neutron-server'
           - 'neutron-dhcp-agent'
           - 'neutron-metadata-agent'
-
-      - name: Start nova services
-        service: name={{ item }}
-                 state=running
-        with_items:
           - 'openstack-nova-scheduler'
           - 'openstack-nova-api'
           - 'openstack-nova-conductor'
-          - 'openstack-nova-compute'
 
       # Required for running tests
       - name: Create an external network
-        quantum_network:                                                        
-            state: present                                                      
+        quantum_network:
+            state: present
             auth_url: "http://{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}:35357/v2.0/"
-            login_username: admin                                               
+            login_username: admin
             login_password: "{{ hostvars[inventory_hostname].admin_password | default('redhat') }}"
-            login_tenant_name: admin                                            
-            name: "{{ installer.network.name }}"                                
+            login_tenant_name: admin
+            name: "{{ installer.network.name }}"
             provider_network_type: "{{ installer.network.external.provider_network_type }}"
-            provider_physical_network: "{{ installer.network.label }}"          
+            provider_physical_network: "{{ installer.network.label }}"
             provider_segmentation_id: "{{ installer.network.external.vlan.tag|default(omit) }}"
-            router_external: yes                                                
-            shared: no                                                          
-            admin_state_up: yes                                                 
-                                                                                
+            router_external: yes
+            shared: no
+            admin_state_up: yes
+
       - name: Create subnet for external network
-        quantum_subnet:                                                         
-            state: present                                                      
+        quantum_subnet:
+            state: present
             auth_url: "http://{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}:35357/v2.0/"
-            login_username: admin                                               
+            login_username: admin
             login_password: "{{ hostvars[inventory_hostname].admin_password | default('redhat') }}"
-            login_tenant_name: admin                                            
-            tenant_name: admin                                                  
-            network_name: "{{ installer.network.name }}"                        
-            name: external-subnet                                               
-            enable_dhcp: False                                                  
+            login_tenant_name: admin
+            tenant_name: admin
+            network_name: "{{ installer.network.name }}"
+            name: external-subnet
+            enable_dhcp: False
             gateway_ip: "{{ provisioner.network.network_list.external.nested.subnet_gateway }}"
             cidr: "{{ provisioner.network.network_list.external.nested.subnet_cidr}}"
             allocation_pool_start: "{{ provisioner.network.network_list.external.nested.allocation_pool_start }}"
             allocation_pool_end: "{{ provisioner.network.network_list.external.nested.allocation_pool_end }}"
+
+- name: Post odl-installation compute steps
+  hosts: compute
+  sudo: yes
+  tasks:
+      - name: Start nova services
+        service: name='openstack-nova-compute'
+                 state=running