Merge pull request #18 from noelmcloughlin/fix2

Remove /opt/stack hardcoding - add stackrc
saltstack-formulas · Dec 1, 2018 · 67336dc · 67336dc
2 parents 1ff8886 + de81240
commit 67336dc
Show file tree

Hide file tree

Showing 4 changed files with 977 additions and 7 deletions.
diff --git a/devstack/clean.sls b/devstack/clean.sls
@@ -15,7 +15,7 @@ openstack-devstack unstack:
       - HOST_IP: {{ grains.ipv4[-1] if not devstack.local.host_ip else devstack.local.host_ip }}
       - HOST_IPV6: {{ grains.ipv6[-1] if not devstack.local.host_ipv6 else devstack.local.host_ipv6 }}
     - runas: {{ devstack.local.username }}
-    - onlyif: test -f {{ devstack.local.sudoers_file }} && getent passwd {{ devstack.local.username }}
+    - onlyif: test -f {{devstack.local.sudoers_file}} && getent passwd {{devstack.local.username}}
     - require_in:
       - file: openstack-devstack cleandown
       - user: openstack-devstack ensure user and group absent
@@ -27,7 +27,7 @@ openstack-devstack clean:
       - HOST_IP: {{ grains.ipv4[-1] if not devstack.local.host_ip else devstack.local.host_ip }}
       - HOST_IPV6: {{ grains.ipv6[-1] if not devstack.local.host_ipv6 else devstack.local.host_ipv6 }}
     - runas: {{ devstack.local.username }}
-    - onlyif: test -f {{ devstack.local.sudoers_file }} && getent passwd {{ devstack.local.username }}
+    - onlyif: test -f {{devstack.local.sudoers_file}} && getent passwd {{devstack.local.username}}
     - require_in:
       - file: openstack-devstack cleandown
       - user: openstack-devstack ensure user and group absent

diff --git a/devstack/files/local.conf.j2 b/devstack/files/local.conf.j2
@@ -5,7 +5,7 @@
 [[local|localrc]]
 ENABLED_SERVICES={{ data.enabled_services or "" }}
 DEST=${DEST:-{{ "/opt/stack" if not dir.dest else dir.dest }}}
-DATA_DIR=${DATA_DIR:-"${DEST}/data"}
+DATA_DIR=${DATA_DIR:-{{ '/opt/stack' if not dir.dest else dir.dest }}/data}
 
 GIT_BASE=${GIT_BASE:-{{ "https://git.openstack.org" if not data.git_base else data.git_base }}}
 GIT_BRANCH=${GIT_BRANCH:-{{ "master" if not data.git_branch else data.git_branch }}}