Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405335 )
Change subject: initial check-in: mostly copied from striker/deploy ...................................................................... initial check-in: mostly copied from striker/deploy Change-Id: Ic5e00b071b3a17ade703cb3363e5bdff5def5d39 --- A .gitignore A .gitmodules A .gitreview A README.md A make_wheels.sh A requirements.txt A scap/checks.yaml A scap/checks/virtualenv.sh A scap/dsh/horizon A scap/scap.cfg 10 files changed, 208 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2764b02 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.py[cod] +/.tox +/_build +/scap/log/ +__pycache__/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1fa661c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "horizon"] + path = horizon + url = https://github.com/openstack/horizon.git +[submodule "wheels"] + path = wheels + url = ../wheels diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..e071211 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=openstack/horizon/deploy.git +defaultbranch=master +defaultrebase=0 diff --git a/README.md b/README.md new file mode 100644 index 0000000..0cac280 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +WMF Horizon deployment +================== + +scap3 deployment configuration and assets for Horizon aka 'openstack dashboard' diff --git a/make_wheels.sh b/make_wheels.sh new file mode 100755 index 0000000..1fa26c6 --- /dev/null +++ b/make_wheels.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Build wheels for distribution +set -o errexit +set -o nounset +set -o pipefail + +BASE=$(realpath $(dirname $0)) +BUILD=${BASE}/_build +VENV=${BUILD}/venv +HORIZON=${BASE}/horizon +WHEEL_DIR=${BASE}/wheels +REQUIREMENTS=${BASE}/requirements.txt + +PIP=${VENV}/bin/pip + +mkdir -p $VENV +virtualenv --python python $VENV || /bin/true +$PIP install --upgrade pip +$PIP install -c http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata -r ${HORIZON}/requirements.txt +#$PIP install -r ${HORIZON}/requirements.txt +$PIP freeze --local --requirement $REQUIREMENTS > $REQUIREMENTS +$PIP install wheel +$PIP wheel --find-links $WHEEL_DIR \ + --wheel-dir $WHEEL_DIR \ + --requirement $REQUIREMENTS diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..92eedf4 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,117 @@ +## The following requirements were added by pip freeze: +amqp==1.4.9 +anyjson==0.3.3 +appdirs==1.4.3 +Babel==2.3.4 +cachetools==2.0.0 +cliff==2.4.0 +cmd2==0.6.9 +contextlib2==0.5.4 +debtcollector==1.11.0 +Django==1.8.17 +django-appconf==1.0.2 +django-babel==0.5.1 +django-compressor==2.1 +django-openstack-auth==3.1.1 +django-pyscss==2.0.2 +enum34==1.1.6 +eventlet==0.19.0 +fasteners==0.14.1 +funcsigs==1.0.2 +functools32==3.2.3.post2 +futures==3.0.5 +futurist==0.21.1 +greenlet==0.4.11 +iso8601==0.1.11 +Jinja2==2.8.1 +jsonpatch==1.15 +jsonpointer==1.10 +jsonschema==2.5.1 +keystoneauth1==2.18.0 +kombu==3.0.37 +MarkupSafe==0.23 +monotonic==1.2 +msgpack-python==0.4.8 +netaddr==0.7.19 +netifaces==0.10.5 +os-client-config==1.26.0 +osc-lib==1.3.0 +oslo.concurrency==3.18.1 +oslo.config==3.22.0 +oslo.context==2.12.2 +oslo.i18n==3.12.0 +oslo.log==3.20.1 +oslo.messaging==5.17.3 +oslo.middleware==3.23.2 +oslo.policy==1.18.0 +oslo.serialization==2.16.1 +oslo.service==1.19.1 +oslo.utils==3.22.1 +osprofiler==1.5.0 +Paste==2.0.3 +PasteDeploy==1.5.2 +pathlib==1.0.1 +pbr==1.10.0 +pika==0.10.0 +pika-pool==0.1.3 +Pint==0.7.2 +positional==1.1.1 +prettytable==0.7.2 +pyinotify==0.9.6 +pymongo==3.4.0 +pyparsing==2.1.10 +pyScss==1.3.4 +python-cinderclient==1.11.0 +python-dateutil==2.6.0 +python-glanceclient==2.6.0 +python-heatclient==1.8.2 +python-keystoneclient==3.10.0 +python-neutronclient==6.1.1 +python-novaclient==7.1.2 +python-swiftclient==3.3.0 +pytz==2016.10 +PyYAML==3.12 +rcssmin==1.0.6 +repoze.lru==0.6 +requests==2.12.5 +requestsexceptions==1.1.3 +rfc3986==0.4.1 +rjsmin==1.0.12 +Routes==2.4.1 +simplejson==3.10.0 +six==1.10.0 +statsd==3.2.1 +stevedore==1.20.1 +tenacity==3.7.1 +unicodecsv==0.14.1 +warlock==1.2.0 +WebOb==1.6.3 +wrapt==1.10.8 +XStatic==1.0.1 +XStatic-Angular==1.5.8.0 +XStatic-Angular-Bootstrap==2.2.0.0 +XStatic-Angular-FileUpload==12.0.4.0 +XStatic-Angular-Gettext==2.3.8.0 +XStatic-Angular-lrdragndrop==1.0.2.2 +XStatic-Angular-Schema-Form==0.8.13.0 +XStatic-Bootstrap-Datepicker==1.3.1.0 +XStatic-Bootstrap-SCSS==3.3.7.1 +XStatic-bootswatch==3.3.7.0 +XStatic-D3==3.5.17.0 +XStatic-Font-Awesome==4.7.0.0 +XStatic-Hogan==2.0.0.2 +XStatic-Jasmine==2.4.1.1 +XStatic-jQuery==1.10.2.1 +XStatic-JQuery-Migrate==1.2.1.1 +XStatic-jquery-ui==1.12.0.1 +XStatic-JQuery.quicksearch==2.0.3.1 +XStatic-JQuery.TableSorter==2.14.5.1 +XStatic-JSEncrypt==2.3.1.1 +XStatic-mdi==1.4.57.0 +XStatic-objectpath==1.2.1.0 +XStatic-Rickshaw==1.5.0.0 +XStatic-roboto-fontface==0.5.0.0 +XStatic-smart-table==1.4.13.2 +XStatic-Spin==1.2.5.2 +XStatic-term.js==0.0.7.0 +XStatic-tv4==1.2.7.0 diff --git a/scap/checks.yaml b/scap/checks.yaml new file mode 100644 index 0000000..4bbe552 --- /dev/null +++ b/scap/checks.yaml @@ -0,0 +1,8 @@ +--- +checks: + virtualenv: + type: command + stage: promote + timeout: 300 + group: default + command: bash /srv/deployment/horizon/deploy/scap/checks/virtualenv.sh diff --git a/scap/checks/virtualenv.sh b/scap/checks/virtualenv.sh new file mode 100755 index 0000000..b964713 --- /dev/null +++ b/scap/checks/virtualenv.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# Create/update a python virtualenv using the wheel binaries +set -o errexit +set -o nounset +set -o pipefail + +VENV=/srv/deployment/horizon/venv +DEPLOY_DIR=/srv/deployment/horizon/deploy +WHEEL_DIR=${DEPLOY_DIR}/wheels +REQUIREMENTS=${DEPLOY_DIR}/requirements.txt + +PIP=${VENV}/bin/pip + +# Ensure that the virtual environment exists +mkdir -p $VENV +virtualenv --python python3 $VENV || /bin/true + +# Install or upgrade all requirements from wheel cache +$PIP install \ + --no-index \ + --find-links ${WHEEL_DIR} \ + --upgrade \ + --force-reinstall \ + --requirement $REQUIREMENTS diff --git a/scap/dsh/horizon b/scap/dsh/horizon new file mode 100644 index 0000000..211fd8d --- /dev/null +++ b/scap/dsh/horizon @@ -0,0 +1 @@ +labweb1001.eqiad.wmnet diff --git a/scap/scap.cfg b/scap/scap.cfg new file mode 100644 index 0000000..f66c52a --- /dev/null +++ b/scap/scap.cfg @@ -0,0 +1,12 @@ +[global] +git_repo: horizon/deploy +git_deploy_dir: /srv/deployment +ssh_user: deploy-service +server_groups: default +dsh_targets: dsh/horizon +git_submodules: True +git_fat: False +service_name: apache2 +service_port: 8080 +batch_size: 1 +max_failures: 1 -- To view, visit https://gerrit.wikimedia.org/r/405335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5e00b071b3a17ade703cb3363e5bdff5def5d39 Gerrit-PatchSet: 1 Gerrit-Project: openstack/horizon/deploy Gerrit-Branch: master Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
