summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-25 19:03:20 +0000
committerGerrit Code Review <review@openstack.org>2018-10-25 19:03:20 +0000
commit4e9642cdaded3bf713d93e873d957279b13f2f57 (patch)
tree523b722e2b03f2f43db55d1e63c3076d2dd8689e
parent1863d36c62d00a0cfddc3859da26a807bd161059 (diff)
parenta79733b4d8bd0045304e747befa186e26995130e (diff)
Merge "Enable shipyard to use PBR"
-rw-r--r--images/airflow/Dockerfile3
-rw-r--r--images/shipyard/Dockerfile4
-rw-r--r--src/bin/shipyard_airflow/setup.cfg30
-rw-r--r--src/bin/shipyard_airflow/setup.py29
-rw-r--r--src/bin/shipyard_client/setup.cfg24
-rw-r--r--src/bin/shipyard_client/setup.py24
6 files changed, 65 insertions, 49 deletions
diff --git a/images/airflow/Dockerfile b/images/airflow/Dockerfile
index e50644c..f5ac4da 100644
--- a/images/airflow/Dockerfile
+++ b/images/airflow/Dockerfile
@@ -97,6 +97,9 @@ COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/
97# Change permissions 97# Change permissions
98RUN chown -R airflow: ${AIRFLOW_HOME} 98RUN chown -R airflow: ${AIRFLOW_HOME}
99 99
100# Setting the version explicitly for PBR
101ENV PBR_VERSION 0.1a1
102
100# Shipyard 103# Shipyard
101# 104#
102# Shipyard provides core functionality used by the airflow plugins/operators 105# Shipyard provides core functionality used by the airflow plugins/operators
diff --git a/images/shipyard/Dockerfile b/images/shipyard/Dockerfile
index 726496d..e3bc337 100644
--- a/images/shipyard/Dockerfile
+++ b/images/shipyard/Dockerfile
@@ -55,10 +55,14 @@ RUN pip3 install -r /home/shipyard/api_requirements.txt
55COPY ${ctx_base}/shipyard_client/requirements.txt /home/shipyard/client_requirements.txt 55COPY ${ctx_base}/shipyard_client/requirements.txt /home/shipyard/client_requirements.txt
56RUN pip3 install -r /home/shipyard/client_requirements.txt 56RUN pip3 install -r /home/shipyard/client_requirements.txt
57 57
58# Setting the version explicitly for PBR
59ENV PBR_VERSION 0.1a1
60
58# Shipyard source and installation 61# Shipyard source and installation
59COPY ${ctx_base}/shipyard_client /home/shipyard/shipyard_client/ 62COPY ${ctx_base}/shipyard_client /home/shipyard/shipyard_client/
60RUN cd /home/shipyard/shipyard_client \ 63RUN cd /home/shipyard/shipyard_client \
61 && python3 setup.py install 64 && python3 setup.py install
65
62COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/ 66COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
63RUN cd /home/shipyard/shipyard \ 67RUN cd /home/shipyard/shipyard \
64 && python3 setup.py install 68 && python3 setup.py install
diff --git a/src/bin/shipyard_airflow/setup.cfg b/src/bin/shipyard_airflow/setup.cfg
new file mode 100644
index 0000000..74543ce
--- /dev/null
+++ b/src/bin/shipyard_airflow/setup.cfg
@@ -0,0 +1,30 @@
1[metadata]
2name = shipyard_airflow
3summary = Directed acyclic graph controller for Kubernetes and OpenStack control plane life cycle management
4description-file = README.md
5author = The Airship Authors
6home-page = https://airship-shipyard.readthedocs.io/
7
8classifier =
9 Intended Audience :: Information Technology
10 Intended Audience :: System Administrators
11 License :: OSI Approved :: Apache Software License
12 Operating System :: POSIX :: Linux
13 Programming Language :: Python
14 Programming Language :: Python :: 3
15 Programming Language :: Python :: 3.5
16 Programming Language :: Python :: 3.6
17
18[files]
19packages =
20 shipyard_airflow
21
22[entry_points]
23oslo.config.opts =
24 shipyard_api = shipyard_airflow.conf.opts:list_opts
25
26oslo.policy.policies =
27 shipyard_api = shipyard_airflow.policy:list_policies
28
29console_scripts =
30 upgrade_db = shipyard_airflow.shipyard_upgrade_db:upgrade_db
diff --git a/src/bin/shipyard_airflow/setup.py b/src/bin/shipyard_airflow/setup.py
index 3042db2..5d4504b 100644
--- a/src/bin/shipyard_airflow/setup.py
+++ b/src/bin/shipyard_airflow/setup.py
@@ -15,30 +15,5 @@
15import setuptools 15import setuptools
16 16
17setuptools.setup( 17setuptools.setup(
18 name='shipyard_api', 18 setup_requires=['pbr>=2.0.0'],
19 version='0.1a1', 19 pbr=True)
20 description=('Directed acyclic graph controller for Kubernetes and '
21 'OpenStack control plane life cycle management'),
22 url='https://github.com/openstack/airship-shipyard',
23 author='The Airship Authors',
24 license='Apache 2.0',
25 packages=setuptools.find_packages(),
26 entry_points={
27 'oslo.config.opts':
28 'shipyard_api = shipyard_airflow.conf.opts:list_opts',
29 'oslo.policy.policies':
30 'shipyard_api = shipyard_airflow.policy:list_policies',
31 'console_scripts':
32 'upgrade_db = shipyard_airflow.shipyard_upgrade_db:upgrade_db',
33 },
34 classifiers=[
35 'Intended Audience :: Information Technology',
36 'Intended Audience :: System Administrators',
37 'License :: OSI Approved :: Apache Software License',
38 'Operating System :: POSIX :: Linux',
39 'Programming Language :: Python',
40 'Programming Language :: Python :: 3',
41 'Programming Language :: Python :: 3.5',
42 'Programming Language :: Python :: 3.6',
43 ],
44)
diff --git a/src/bin/shipyard_client/setup.cfg b/src/bin/shipyard_client/setup.cfg
new file mode 100644
index 0000000..2529476
--- /dev/null
+++ b/src/bin/shipyard_client/setup.cfg
@@ -0,0 +1,24 @@
1[metadata]
2name = shipyard_client
3summary = CLI for shipyard
4description-file = README.md
5author = The Airship Authors
6home-page = https://airship-shipyard.readthedocs.io/
7
8classifier =
9 Intended Audience :: Information Technology
10 Intended Audience :: System Administrators
11 License :: OSI Approved :: Apache Software License
12 Operating System :: POSIX :: Linux
13 Programming Language :: Python
14 Programming Language :: Python :: 3
15 Programming Language :: Python :: 3.5
16 Programming Language :: Python :: 3.6
17
18[files]
19packages =
20 shipyard_client
21
22[entry_points]
23console_scripts =
24 shipyard = shipyard_client.cli.commands:shipyard
diff --git a/src/bin/shipyard_client/setup.py b/src/bin/shipyard_client/setup.py
index 0981f64..5d4504b 100644
--- a/src/bin/shipyard_client/setup.py
+++ b/src/bin/shipyard_client/setup.py
@@ -15,25 +15,5 @@
15import setuptools 15import setuptools
16 16
17setuptools.setup( 17setuptools.setup(
18 name='shipyard_client', 18 setup_requires=['pbr>=2.0.0'],
19 version='0.1a1', 19 pbr=True)
20 description='CLI for Shipyard',
21 url='https://github.com/openstack/airship-shipyard',
22 author='The Airship Authors',
23 license='Apache 2.0',
24 packages=setuptools.find_packages(),
25 entry_points={
26 'console_scripts':
27 'shipyard = shipyard_client.cli.commands:shipyard'
28 },
29 classifiers=[
30 'Intended Audience :: Information Technology',
31 'Intended Audience :: System Administrators',
32 'License :: OSI Approved :: Apache Software License',
33 'Operating System :: POSIX :: Linux',
34 'Programming Language :: Python',
35 'Programming Language :: Python :: 3',
36 'Programming Language :: Python :: 3.5',
37 'Programming Language :: Python :: 3.6',
38 ],
39)