diff --git a/README.md b/README.md index 5876501..db5192c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The legacy file_root sync layout (`_modules`, `_states`, `_utils`) has been remo - [API Modules Reference](docs/ref/modules.rst) - [API States Reference](docs/ref/states.rst) -The files under the `nexus3` and `salt/pillar` folders can be used as examples for using these modules. +The files under `tests/files/salt/nexus3` and `tests/files/salt/pillar` can be used as examples for using these modules. The nexus3 execution modules depend on the python requests library which should already be installed from the installation of the salt minion. diff --git a/docker-compose.yml b/docker-compose.yml index 832b348..02239b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,8 @@ services: SALT_MASTER_CONFIG: '{"auto_accept": true}' volumes: - $PWD:/workspace - - $PWD/nexus3:/srv/salt/nexus3 - - $PWD/salt/pillar:/srv/pillar + - $PWD/tests/files/salt/nexus3:/srv/salt/nexus3 + - $PWD/tests/files/salt/pillar:/srv/pillar salt-minion: image: saltstack/salt:3006.5 diff --git a/nexus3/blobstores.sls b/nexus3/blobstores.sls deleted file mode 100644 index d20da51..0000000 --- a/nexus3/blobstores.sls +++ /dev/null @@ -1,15 +0,0 @@ -# states based on pillar data -{% from tpldir + "/map.jinja" import nexus with context %} - -{% for blobstore, data in nexus['blobstores'].items() %} -create_blobstore_{{ blobstore }}: - nexus3_blobstores.present: - - name: {{ blobstore }} - {% for item in data %} - - {{ item }} - {% endfor %} -{% endfor %} - -remove_unwanted-blobstore: - nexus3_blobstores.absent: - - name: unwanted-blobstore \ No newline at end of file diff --git a/nexus3/init.sls b/nexus3/init.sls deleted file mode 100644 index 9f350f0..0000000 --- a/nexus3/init.sls +++ /dev/null @@ -1,42 +0,0 @@ -{% from tpldir + "/map.jinja" import nexus with context %} - -# create nexus user on host that -# matches the user in the docker container -nexus_user: - group.present: - - name: nexus - - gid: {{ nexus['user_id'] }} - user.present: - - name: nexus - - uid: {{ nexus['user_id'] }} - - gid: {{ nexus['user_id'] }} - - shell: /bin/bash - - system: True - -# create folder on host to persist data -nexus_data_dir: - file.directory: - - name: {{ nexus['data_dir'] }} - - user: {{ nexus['user_id'] }} - - group: {{ nexus['user_id'] }} - - makedirs: True - - mode: 755 - -# always pull new image -nexus: - docker_image.present: - - force: True - - name: sonatype/nexus3:latest - docker_container.running: - - name: nexus - - image: sonatype/nexus3:latest - - log_driver: json-file - - log_opt: - - max-size: "10m" - - max-file: "3" - - port_bindings: - - "8081:8081" - - "5000:5000" - - binds: - - {{ nexus['data_dir'] }}:/nexus-data - - restart_policy: always diff --git a/nexus3/map.jinja b/nexus3/map.jinja deleted file mode 100644 index b609951..0000000 --- a/nexus3/map.jinja +++ /dev/null @@ -1,12 +0,0 @@ -{% set nexus = ({ - 'docker_image': 'sonatype/nexus', - 'image_version': 'latest', - 'data_dir': '/data/nexus', - 'user_id': '200', - 'blobstores': salt['pillar.get']('nexus3:blobstores',{}), - 'privileges': salt['pillar.get']('nexus3:privileges',{}), - 'repositories': salt['pillar.get']('nexus3:repositories',{}), - 'roles': salt['pillar.get']('nexus3:roles',{}), - 'users': salt['pillar.get']('nexus3:users',{}), - 'tasks': salt['pillar.get']('nexus3:tasks',{}) -}) %} diff --git a/nexus3/privileges.sls b/nexus3/privileges.sls deleted file mode 100644 index dbefedd..0000000 --- a/nexus3/privileges.sls +++ /dev/null @@ -1,14 +0,0 @@ -{% from tpldir + "/map.jinja" import nexus with context %} - -{% for privilege, data in nexus['privileges'].items() %} -create_privilege_{{ privilege }}: - nexus3_privileges.present: - - name: {{ privilege }} - {% for item in data %} - - {{ item }} - {% endfor %} -{% endfor %} - -remove_unwanted-privilege: - nexus3_privileges.absent: - - name: unwanted-privilege \ No newline at end of file diff --git a/nexus3/repositories.sls b/nexus3/repositories.sls deleted file mode 100644 index d1d3555..0000000 --- a/nexus3/repositories.sls +++ /dev/null @@ -1,14 +0,0 @@ -{% from tpldir + "/map.jinja" import nexus with context %} - -{% for repository, data in nexus['repositories'].items() %} -repositories_{{ repository }}: - nexus3_repositories.present: - - name: {{ repository }} - {% for item in data %} - - {{ item }} - {% endfor %} -{% endfor %} - -remove_unwanted-hosted_repo: - nexus3_repositories.absent: - - name: unwanted-hosted \ No newline at end of file diff --git a/nexus3/roles.sls b/nexus3/roles.sls deleted file mode 100644 index 6afbe0f..0000000 --- a/nexus3/roles.sls +++ /dev/null @@ -1,14 +0,0 @@ -{% from tpldir + "/map.jinja" import nexus with context %} - -{% for role, data in nexus['roles'].items() %} -role_{{ role }}: - nexus3_roles.present: - - name: {{ role }} - {% for item in data %} - - {{ item }} - {% endfor %} -{% endfor %} - -remove_unwanted-role: - nexus3_roles.absent: - - name: unwanted-role \ No newline at end of file diff --git a/nexus3/scripts.sls b/nexus3/scripts.sls deleted file mode 100644 index 61967bf..0000000 --- a/nexus3/scripts.sls +++ /dev/null @@ -1,18 +0,0 @@ -{% from tpldir + "/map.jinja" import nexus with context %} - -# nexus3_scripts require the groovy script api to be enabled -http://localhost:8081: - nexus3_scripts.base_url - -# create tasks based on dictionary from pillars -{% for task, data in nexus['tasks'].items() %} -task_{{ task }}: - nexus3_scripts.task: - - name: {{ task }} - - typeId: {{ data['typeId'] }} - - taskProperties: {{ data['taskProperties'] }} - - cron: {{ data['cron'] }} - {% if data['setAlertEmail'] is defined %} - - setAlertEmail: {{ data['setAlertEmail'] }} - {%endif %} -{% endfor %} \ No newline at end of file diff --git a/nexus3/setup.sls b/nexus3/setup.sls deleted file mode 100644 index 7cc7504..0000000 --- a/nexus3/setup.sls +++ /dev/null @@ -1,28 +0,0 @@ -include: - - .blobstores - - .repositories - - .privileges - - .roles - - .users - - .scripts - -set_anonymous_access_true: - nexus3_security.anonymous_access: - - enabled: True - -update_realms: - nexus3_security.realms: - - realms: - - NexusAuthenticatingRealm - - NexusAuthorizingRealm - - DockerToken - -setup_email: - nexus3_email.configure: - - enabled: True - - host: smtp.example.com - - port: 587 - - fromAddress: test@example.com - - startTlsEnabled: True - - diff --git a/nexus3/users.sls b/nexus3/users.sls deleted file mode 100644 index d0ca2b1..0000000 --- a/nexus3/users.sls +++ /dev/null @@ -1,14 +0,0 @@ -{% from tpldir + "/map.jinja" import nexus with context %} - -{% for user, data in nexus['users'].items() %} -user_{{ user }}: - nexus3_users.present: - - name: {{ user }} - {% for item in data %} - - {{ item }} - {% endfor %} -{% endfor %} - -remove_unwanted_user: - nexus3_users.absent: - - name: unwanted-user \ No newline at end of file diff --git a/salt/pillar/nexus3.sls b/tests/files/salt/pillar/nexus3.sls similarity index 100% rename from salt/pillar/nexus3.sls rename to tests/files/salt/pillar/nexus3.sls diff --git a/salt/pillar/top.sls b/tests/files/salt/pillar/top.sls similarity index 100% rename from salt/pillar/top.sls rename to tests/files/salt/pillar/top.sls