Merge pull request apache#433 from theopenlab/fix-trove

Fix trove deployment failing
bzhaoopenstack · Feb 21, 2019 · 1462735 · 1462735
2 parents c56efb6 + cb1a7c3
commit 1462735
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml b/playbooks/terraform-provider-openstack-acceptance-test-trove/run.yaml
@@ -1,37 +1,22 @@
 - hosts: all
   become: yes
-  tasks:
-    - name:  Prepare git repos for trove environment
-      shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/stack/
-          cp -r /opt/git/openstack/* /opt/stack/
-          cp -r /opt/git/openstack-dev/devstack /home/zuul/
-          if [ ! -d /opt/stack/trove ]; then
-              git clone git://git.openstack.org/openstack/trove /opt/stack/trove
-          fi
-          pip install -r /opt/stack/trove/requirements.txt
-          chown zuul.zuul /opt/stack/ -R
-          chown zuul.zuul /home/zuul/ -R
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-- hosts: all
+  roles:
+    - clone-devstack-gate-to-workspace
+    - role: create-devstack-local-conf
+      enable_services:
+        - 'trove'
+    - install-devstack
   tasks:
     - name:  Install and init trove environment
       shell:
         cmd: |
           set -e
           set -x
-          export BRIDGE_IP=10.1.0.1
+          export BRIDGE_IP=10.0.0.1
           export DEST='/opt/stack'
           export PATH_DEVSTACK_SRC=$DEST/devstack
           export TROVE_RESIZE_TIME_OUT=''
           cd $DEST/trove
-          tox -etrovestack -vv -- install
           tox -etrovestack -vv -- kick-start mysql
           source /home/zuul/devstack/openrc admin admin
 

diff --git a/roles/create-devstack-local-conf/tasks/main.yml b/roles/create-devstack-local-conf/tasks/main.yml
@@ -41,6 +41,19 @@
   when:
     - '"heat" in enable_services'
 
+# Populate local conf with trove service enabled
+- name: create devstack local conf with Trove enabled
+  shell:
+    cmd: |
+      set -e
+      set -x
+      cat << EOF >> /tmp/dg-local.conf
+      enable_plugin trove git://git.openstack.org/openstack/trove
+      EOF
+    executable: /bin/bash
+  when:
+    - '"trove" in enable_services'
+
 # Use neutron-* services to replace q-* services except Mitaka, Newton, Ocata and Pike
 - name: enable neutron services by new services names
   shell: