selinux.module looks for module source in the base environment, not the current environment

[xenophonf]

Description of Issue/Question

Other states that take source kwargs (e.g., file.managed) will look in the current environment for those files. The selinux.module state looks in the base environment instead, which breaks state execution in multi-environment setups.

Setup

https://github.com/irtnog/salt-states/tree/development/tomcat/pwm.sls
https://github.com/irtnog/salt-states/tree/development/tomcat/files/tomcat-mysql.te

Note that in my setup, I use the base environment solely for targeting.

Steps to Reproduce Issue

1. Write an SELinux type enforcement module and corresponding SLS file that calls selinux.module (e.g., above), and save them to an environment other than base.

2. Run the SLS file in that environment (e.g., salt-call state.apply tomcat.pwm saltenv=development).

The relevant log entries:

[DEBUG   ] LazyLoaded selinux.module
[INFO    ] Running state [pwm_tomcat] at time 11:52:09.166189
[INFO    ] Executing state selinux.module for [pwm_tomcat]
[DEBUG   ] Could not find file 'salt://tomcat/files/tomcat-mysql.te' in saltenv 'base'
[ERROR   ] Unable to cache file 'salt://tomcat/files/tomcat-mysql.te' from saltenv 'base'.
[INFO    ] Executing command 'semodule -i False' in directory '/root'
[ERROR   ] Command 'semodule -i False' failed with return code: 1
[ERROR   ] output: libsemanage.map_file: Unable to open False
 (No such file or directory).
libsemanage.semanage_direct_install_file: Unable to read file False
 (No such file or directory).
semodule:  Failed on False!
[ERROR   ] Failed to install module salt://tomcat/files/tomcat-mysql.te
[INFO    ] Completed state [pwm_tomcat] at time 11:52:09.511841 duration_in_ms=345.653

Versions Report

Salt Version:
           Salt: 2017.7.1

Dependency Versions:
           cffi: Not Installed
       cherrypy: Not Installed
       dateutil: 1.5
      docker-py: Not Installed
          gitdb: Not Installed
      gitpython: Not Installed
          ioflo: Not Installed
         Jinja2: 2.7.2
        libgit2: Not Installed
        libnacl: Not Installed
       M2Crypto: Not Installed
           Mako: Not Installed
   msgpack-pure: Not Installed
 msgpack-python: 0.4.8
   mysql-python: 1.2.5
      pycparser: Not Installed
       pycrypto: 2.6.1
   pycryptodome: Not Installed
         pygit2: Not Installed
         Python: 2.7.5 (default, Aug  4 2017, 00:39:18)
   python-gnupg: Not Installed
         PyYAML: 3.11
          PyZMQ: 15.3.0
           RAET: Not Installed
          smmap: Not Installed
        timelib: Not Installed
        Tornado: 4.2.1
            ZMQ: 4.1.4

System Versions:
           dist: centos 7.4.1708 Core
         locale: UTF-8
        machine: x86_64
        release: 3.10.0-693.2.2.el7.x86_64
         system: Linux
        version: CentOS Linux 7.4.1708 Core

[xenophonf]

I realize now that I'm supposed to use selinux.module to deploy .pp files, not .te files. Still, it's looking in the wrong environment for the files.

[gtmanfred]

Should be easy enough to pass __env__ to the command if no environment is passed to the state/module.

Would you mind submitting a PR for this?

Thanks,
Daniel

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

If this issue is closed prematurely, please leave a comment and we will gladly reopen the issue.