diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..86e34d6 --- /dev/null +++ b/README.rst @@ -0,0 +1,10 @@ +This project is no longer maintained. + +The contents of this repository are still available in the Git +source code management system. To see the contents of this +repository before it reached its end of life, please check out the +previous commit with "git checkout HEAD^1". + +For any further questions, please email +openstack-discuss@lists.openstack.org or join #openstack-dev on +Freenode. diff --git a/docker/redis/Dockerfile.j2 b/docker/redis/Dockerfile.j2 deleted file mode 100644 index c63e9b4..0000000 --- a/docker/redis/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{ image_spec("base-tools") }} -MAINTAINER {{ maintainer }} - -COPY redis_sudoers /etc/sudoers.d/redis_sudoers - -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/redis_sudoers \ - && useradd redis -G microservices \ - && apt-key adv --keyserver {{ url.redis.debian.keyserver }} --recv-keys {{ url.redis.debian.keys }} \ - && apt-get update \ - && apt-get install --no-install-recommends -y -t jessie-backports redis-server \ - && apt-get clean - -USER redis diff --git a/docker/redis/redis_sudoers b/docker/redis/redis_sudoers deleted file mode 100644 index 7dec151..0000000 --- a/docker/redis/redis_sudoers +++ /dev/null @@ -1,2 +0,0 @@ -%microservices ALL=(root) NOPASSWD: /bin/chown -R redis\: /var/lib/redis /var/log/ccp/redis -%microservices ALL=(root) NOPASSWD: /bin/chown -R redis\: /var/log/ccp/redis diff --git a/docker/zmq-proxy/Dockerfile.j2 b/docker/zmq-proxy/Dockerfile.j2 deleted file mode 100644 index a4ff16c..0000000 --- a/docker/zmq-proxy/Dockerfile.j2 +++ /dev/null @@ -1,10 +0,0 @@ -FROM {{ image_spec("openstack-base") }} -MAINTAINER {{ maintainer }} - -COPY zmq_sudoers /etc/sudoers.d/zmq_sudoers -RUN chmod 750 /etc/sudoers.d && \ - chmod 440 /etc/sudoers.d/zmq_sudoers && \ - useradd zmq-proxy -G microservices -s /bin/false && \ - mkdir -p /etc/zmq && chown -R zmq-proxy /etc/zmq - -USER zmq-proxy diff --git a/docker/zmq-proxy/zmq_sudoers b/docker/zmq-proxy/zmq_sudoers deleted file mode 100644 index 2e8239a..0000000 --- a/docker/zmq-proxy/zmq_sudoers +++ /dev/null @@ -1 +0,0 @@ -%microservices ALL=(root) NOPASSWD: /bin/chown -R zmq-proxy /var/log/ccp/zmq diff --git a/exports/oslo_messaging.j2 b/exports/oslo_messaging.j2 deleted file mode 100644 index 74a5c55..0000000 --- a/exports/oslo_messaging.j2 +++ /dev/null @@ -1,28 +0,0 @@ -{% macro zmq(cfg_type) %} - -{% if cfg_type == 'rpc_config' -%} - [DEFAULT] -{%- elif cfg_type == 'notifications_config' -%} - [oslo_messaging_notifications] -{%- endif %} -transport_url=zmq:// - -[oslo_messaging_zmq] -rpc_zmq_host={{ network_topology["private"]["address"] }} -use_router_proxy=true -rpc_use_acks=true - -{% if zeromq.matchmaker == 'redis' %} -[oslo_messaging_zmq] -rpc_zmq_matchmaker=redis - -[matchmaker_redis] -password={{ redis.password }} - -{% if redis.deployment == 'single' %} -host={{ address('redis') }} -port={{ redis.ports.server.cont }} -{% endif %} - -{% endif %} -{% endmacro %} diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml deleted file mode 100644 index bc1f366..0000000 --- a/service/files/defaults.yaml +++ /dev/null @@ -1,29 +0,0 @@ -configs: - messaging: - dependencies: - zmq: zmq-proxy - zeromq: - matchmaker: redis - proxy: - ports: - frontend: - cont: 50001 - backend: - cont: 50002 - publisher: - cont: 50003 - redis: - deployment: single - ports: - server: - cont: 6379 - -secret_configs: - redis: - password: password - -url: - redis: - debian: - keyserver: keyserver.ubuntu.com - keys: "7638D0442B90D010 8B48AD6246925553" diff --git a/service/files/redis.conf.j2 b/service/files/redis.conf.j2 deleted file mode 100644 index 0e0c9f4..0000000 --- a/service/files/redis.conf.j2 +++ /dev/null @@ -1,54 +0,0 @@ -pidfile /var/run/redis/redis-server.pid -logfile /var/log/ccp/redis/redis.log -dir /var/lib/redis - -bind {{ network_topology["private"]["address"] }} -port {{ redis.ports.server.cont }} - -requirepass {{ redis.password }} -masterauth {{ redis.password }} - -protected-mode no -timeout 0 -tcp-keepalive 300 -loglevel notice -databases 16 -save 900 1 -save 300 10 -save 60 10000 -stop-writes-on-bgsave-error yes -rdbcompression yes -rdbchecksum yes -dbfilename dump.rdb -slave-serve-stale-data yes -slave-read-only yes -repl-diskless-sync no -repl-diskless-sync-delay 5 -repl-disable-tcp-nodelay no -slave-priority 100 -appendonly no -appendfilename "appendonly.aof" -appendfsync everysec -no-appendfsync-on-rewrite no -auto-aof-rewrite-percentage 100 -auto-aof-rewrite-min-size 64mb -aof-load-truncated yes -lua-time-limit 5000 -slowlog-log-slower-than 10000 -slowlog-max-len 128 -latency-monitor-threshold 0 -notify-keyspace-events "" -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 -list-max-ziplist-entries 512 -list-max-ziplist-value 64 -set-max-intset-entries 512 -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 -hll-sparse-max-bytes 3000 -activerehashing yes -client-output-buffer-limit normal 0 0 0 -client-output-buffer-limit slave 256mb 64mb 60 -client-output-buffer-limit pubsub 32mb 8mb 60 -hz 10 -aof-rewrite-incremental-fsync yes diff --git a/service/files/zmq-proxy.conf.j2 b/service/files/zmq-proxy.conf.j2 deleted file mode 100644 index cb92a88..0000000 --- a/service/files/zmq-proxy.conf.j2 +++ /dev/null @@ -1,19 +0,0 @@ -[zmq_proxy_opts] -host={{ network_topology["private"]["address"] }} -frontend-port={{ zeromq.proxy.ports.frontend.cont }} -backend-port={{ zeromq.proxy.ports.backend.cont }} -publisher-port={{ zeromq.proxy.ports.publisher.cont }} - -{% if zeromq.matchmaker == 'redis' %} -[oslo_messaging_zmq] -rpc_zmq_matchmaker=redis - -[matchmaker_redis] -password={{ redis.password }} - -{% if redis.deployment == 'single' %} -host={{ address('redis') }} -port={{ redis.ports.server.cont }} -{% endif %} - -{% endif %} diff --git a/service/redis.yaml b/service/redis.yaml deleted file mode 100644 index 960801e..0000000 --- a/service/redis.yaml +++ /dev/null @@ -1,29 +0,0 @@ -dsl_version: 0.2.0 -service: - name: redis - antiAffinity: local - ports: - - {{ redis.ports.server }} - containers: - - name: redis - image: redis - pre: - - name: chown-logs-dir - command: "sudo /bin/chown -R redis: /var/lib/redis /var/log/ccp/redis" - daemon: - files: - - redis-conf - command: redis-server /etc/redis/redis.conf - volumes: - - name: redis-logs - path: "/var/log/ccp/redis" - type: host - readOnly: False - - name: redis-data - path: "/var/lib/redis" - type: empty-dir - readOnly: False -files: - redis-conf: - path: /etc/redis/redis.conf - content: redis.conf.j2 diff --git a/service/zmq-proxy.yaml b/service/zmq-proxy.yaml deleted file mode 100644 index cac68a6..0000000 --- a/service/zmq-proxy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -dsl_version: 0.2.0 -service: - name: zmq-proxy - ports: - - {{ zeromq.proxy.ports.frontend }} - - {{ zeromq.proxy.ports.backend }} - - {{ zeromq.proxy.ports.publisher }} - containers: - - name: zmq-proxy - image: zmq-proxy - pre: - - name: chown-logs-dir - command: "sudo /bin/chown -R zmq-proxy /var/log/ccp/zmq" - daemon: - files: - - zmq-conf - command: oslo-messaging-zmq-proxy --config-file /etc/zmq/zmq-proxy.conf - dependencies: - - {{ zeromq.matchmaker }} - volumes: - - name: zmq-logs - path: "/var/log/ccp/zmq" - type: host - readOnly: False -files: - zmq-conf: - path: /etc/zmq/zmq-proxy.conf - content: zmq-proxy.conf.j2 diff --git a/tools/yamllint.sh b/tools/yamllint.sh deleted file mode 100755 index 6e84445..0000000 --- a/tools/yamllint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -ex - -workdir=$(dirname $0) -yamllint -c $workdir/yamllint.yaml $(find . -not -path '*/\.*' -type f -name '*.yaml') diff --git a/tools/yamllint.yaml b/tools/yamllint.yaml deleted file mode 100644 index 6c2e4a7..0000000 --- a/tools/yamllint.yaml +++ /dev/null @@ -1,21 +0,0 @@ -extends: default - -rules: - braces: - max-spaces-inside: 1 - comments: - level: error - comments-indentation: - level: warning - document-end: - present: no - document-start: - level: error - present: no - empty-lines: - max: 1 - max-start: 0 - max-end: 0 - line-length: - level: warning - max: 120 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 8b6a5b9..0000000 --- a/tox.ini +++ /dev/null @@ -1,17 +0,0 @@ -[tox] -minversion = 1.6 -envlist = linters,bashate -skipsdist = True - -[testenv:linters] -deps = yamllint -commands = - {toxinidir}/tools/yamllint.sh - -[testenv:bashate] -deps = bashate>=0.2 -whitelist_externals = bash -commands = bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v" - -[testenv:venv] -commands = {posargs}