ZEN-33776 Move executables to libexec (#556)

zenoss · Apr 8, 2024 · c541e26 · c541e26
1 parent 07f1ef2
commit c541e26
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 12 deletions.
diff --git a/ZenPacks/zenoss/OpenStackInfrastructure/__init__.py b/ZenPacks/zenoss/OpenStackInfrastructure/__init__.py
@@ -70,10 +70,6 @@ def install(self, app):
             # the config is updated if the script has changed.
             force_update_configs(self, "proxy-zenopenstack", ["opt/zenoss/bin/proxy-zenopenstack"])
 
-
-
-        self.chmodScripts()
-
     def getServiceDefinitionFiles(self):
         # The default version of this is only called during initial installation,
         # and returns all services.   This version can be called during upgrades
@@ -136,11 +132,6 @@ def remove(self, app, leaveObjects=False):
 
         remove_migrate_zenpython()
 
-    def chmodScripts(self):
-        for script in ('poll_openstack.py',
-                       'openstack_amqp_init.py',
-                       'openstack_helper.py'):
-            os.system('chmod 0755 {0}'.format(self.path(script)))
 
 # Patch last to avoid import recursion problems.
 from ZenPacks.zenoss.OpenStackInfrastructure import patches

diff --git a/ZenPacks/zenoss/OpenStackInfrastructure/api.py b/ZenPacks/zenoss/OpenStackInfrastructure/api.py
@@ -38,7 +38,7 @@
 
 OPENSTACK_DEVICE_PATH = "/Devices/OpenStack/Infrastructure"
 
-_helper = zenpack_path('openstack_helper.py')
+_helper = zenpack_path('libexec/openstack_helper.py')
 
 cmd_regex = re.compile('(--api_key=)(?P<password>[\wa-zA-Z0-9_.-]+)')
 

diff --git a/ZenPacks/zenoss/OpenStackInfrastructure/bin/openstack_amqp_config b/ZenPacks/zenoss/OpenStackInfrastructure/bin/openstack_amqp_config
@@ -4,4 +4,4 @@ CURRENTDIR="$(dirname "$(which "$0")")"
 PARENTDIR=$(dirname $CURRENTDIR)
 
 # Create any required exchanges
-$PARENTDIR/openstack_amqp_init.py
+$PARENTDIR/libexec/openstack_amqp_init.py
diff --git a/...tackInfrastructure/openstack_amqp_init.py → ...astructure/libexec/openstack_amqp_init.py b/...tackInfrastructure/openstack_amqp_init.py → ...astructure/libexec/openstack_amqp_init.py
diff --git a/...enStackInfrastructure/openstack_helper.py → ...nfrastructure/libexec/openstack_helper.py b/...enStackInfrastructure/openstack_helper.py → ...nfrastructure/libexec/openstack_helper.py
diff --git a/...OpenStackInfrastructure/poll_openstack.py → ...kInfrastructure/libexec/poll_openstack.py b/...OpenStackInfrastructure/poll_openstack.py → ...kInfrastructure/libexec/poll_openstack.py
diff --git a/ZenPacks/zenoss/OpenStackInfrastructure/zenpack.yaml b/ZenPacks/zenoss/OpenStackInfrastructure/zenpack.yaml
@@ -243,7 +243,7 @@ device_classes:
             cycletime: 300
           openstack:
             type: COMMAND
-            commandTemplate: ${here/ZenPackManager/packs/ZenPacks.zenoss.OpenStackInfrastructure/path}/poll_openstack.py
+            commandTemplate: ${here/ZenPackManager/packs/ZenPacks.zenoss.OpenStackInfrastructure/path}/libexec/poll_openstack.py
               '${here/zCommandUsername}' '${here/zCommandPassword}' '${here/zOpenStackProjectId}'
               '${here/zOpenStackUserDomainName}' '${here/zOpenStackProjectDomainName}' '${here/zOpenStackAuthUrl}' '${here/zOpenStackRegionName}'
             datapoints: