Merge "Fixes ceph deploy gates"

ansible/roles/ceph/tasks/config.yml

@@ -26,11 +26,11 @@
     - name: "ceph-rgw"
       group: ceph-rgw
     - name: "ceph-mgr"
-      group: "ceph-mgr"
+      group: ceph-mgr
     - name: "ceph-mds"
-      group: "ceph-mds"
+      group: ceph-mds
     - name: "ceph-nfs"
-      group: "ceph-nfs"
+      group: ceph-nfs
 
 - name: Copying over ceph.conf
   vars:

ansible/roles/ceph/tasks/deploy.yml

@@ -13,7 +13,9 @@
   when: inventory_hostname in groups['ceph-mgr']
 
 - include: start_nfss.yml
-  when: inventory_hostname in groups['ceph-nfs']
+  when:
+    - enable_ceph_nfs | bool
+    - inventory_hostname in groups['ceph-nfs']
 
 - include: bootstrap_osds.yml
   when: inventory_hostname in groups['ceph-osd']

tests/run.yml

@@ -1,4 +1,14 @@
 ---
+- hosts: all
+  vars:
+    kolla_ansible_src_dir: "src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
+    kolla_ansible_full_src_dir: "{{ zuul.executor.work_root }}/{{ kolla_ansible_src_dir }}"
+  tasks:
+    - name: Prepare ceph disks
+      script: "{{ kolla_ansible_full_src_dir }}/tests/setup_ceph_disks.sh"
+      when: scenario == "ceph"
+      become: true
+
 - hosts: primary
   vars:
     kolla_inventory_path: "/etc/kolla/inventory"
@@ -92,11 +102,6 @@
       shell: "{{ kolla_ansible_src_dir }}/tools/generate_passwords.py"
       delegate_to: "primary"
 
-    - name: Prepare ceph disks
-      script: "{{ kolla_ansible_full_src_dir }}/tests/setup_ceph_disks.sh"
-      when: scenario == "ceph"
-      become: true
-
     - name: generate ceph config overrides
       template:
         src: "{{ kolla_ansible_full_src_dir }}/tests/templates/ceph-overrides.j2"
@@ -113,6 +118,7 @@
           export NODEPOOL_TARBALLS_MIRROR=http://{{ zuul_site_mirror_fqdn }}:8080/tarballs
           export BUILD_IMAGE={{ need_build_image }}
           export KOLLA_SRC_DIR={{ ansible_env.HOME }}/src/git.openstack.org/openstack/kolla
+          export ACTION={{ scenario }}
 
           tools/setup_gate.sh
         executable: /bin/bash

tests/templates/inventory.j2

@@ -10,11 +10,21 @@
 {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} ansible_become=true ansible_user={{ hostvars[host]['ansible_user'] }}
 {% endfor %}
 
-[compute]
+# inner-compute is the groups of compute nodes which do not have
+# external reachability
+[inner-compute]
+
+# external-compute is the groups of compute nodes which can reach
+# outside
+[external-compute]
 {% for host in hostvars %}
 {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} ansible_become=true ansible_user={{ hostvars[host]['ansible_user'] }}
 {% endfor %}
 
+[compute:children]
+inner-compute
+external-compute
+
 [storage]
 {% for host in hostvars %}
 {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} ansible_become=true ansible_user={{ hostvars[host]['ansible_user'] }}
@@ -187,6 +197,9 @@ control
 [tacker:children]
 control
 
+[vitrage:children]
+control
+
 # Tempest
 [tempest:children]
 control
@@ -292,9 +305,15 @@ neutron
 neutron
 
 # Ceph
+[ceph-mds:children]
+ceph
+
 [ceph-mgr:children]
 ceph
 
+[ceph-nfs:children]
+ceph
+
 [ceph-mon:children]
 ceph
 
@@ -488,18 +507,12 @@ sahara
 sahara
 
 # Ceilometer
-[ceilometer-api:children]
-ceilometer
-
 [ceilometer-central:children]
 ceilometer
 
 [ceilometer-notification:children]
 ceilometer
 
-[ceilometer-collector:children]
-ceilometer
-
 [ceilometer-compute:children]
 compute
 
@@ -561,6 +574,9 @@ designate
 [designate-central:children]
 designate
 
+[designate-producer:children]
+designate
+
 [designate-mdns:children]
 network
 
@@ -598,3 +614,19 @@ tacker
 
 [tacker-conductor:children]
 tacker
+
+# Vitrage
+[vitrage-api:children]
+vitrage
+
+[vitrage-notifier:children]
+vitrage
+
+[vitrage-graph:children]
+vitrage
+
+[vitrage-collector:children]
+vitrage
+
+[vitrage-ml:children]
+vitrage

tools/setup_gate.sh

@@ -160,10 +160,6 @@ setup_node
 tools/kolla-ansible -i ${RAW_INVENTORY} bootstrap-servers > /tmp/logs/ansible/bootstrap-servers
 prepare_images
 
-if echo $ACTION | grep -q "ceph"; then
-    ansible-playbook -i ${RAW_INVENTORY} tests/ansible_setup_ceph_disks.yml > /tmp/logs/ansible/setup_ceph_disks
-fi
-
 # Create dummy interface for neutron
 ansible -m shell -i ${RAW_INVENTORY} -a "ip l a fake_interface type dummy" all