Enable shipyard to use PBR
This PS enables shipyard to use PBR as rest of the other OpenStack project. Currently if shipyard is used as a requirement in another project, the dependencies for shipyard doesn't get installed. This PS fixes this bug. Change-Id: I34d452649a886af9d865d4ad51eeab70399fe395
This commit is contained in:
parent
1c8fd5ce4f
commit
a79733b4d8
|
@ -97,6 +97,9 @@ COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/
|
||||||
# Change permissions
|
# Change permissions
|
||||||
RUN chown -R airflow: ${AIRFLOW_HOME}
|
RUN chown -R airflow: ${AIRFLOW_HOME}
|
||||||
|
|
||||||
|
# Setting the version explicitly for PBR
|
||||||
|
ENV PBR_VERSION 0.1a1
|
||||||
|
|
||||||
# Shipyard
|
# Shipyard
|
||||||
#
|
#
|
||||||
# Shipyard provides core functionality used by the airflow plugins/operators
|
# Shipyard provides core functionality used by the airflow plugins/operators
|
||||||
|
|
|
@ -55,10 +55,14 @@ RUN pip3 install -r /home/shipyard/api_requirements.txt
|
||||||
COPY ${ctx_base}/shipyard_client/requirements.txt /home/shipyard/client_requirements.txt
|
COPY ${ctx_base}/shipyard_client/requirements.txt /home/shipyard/client_requirements.txt
|
||||||
RUN pip3 install -r /home/shipyard/client_requirements.txt
|
RUN pip3 install -r /home/shipyard/client_requirements.txt
|
||||||
|
|
||||||
|
# Setting the version explicitly for PBR
|
||||||
|
ENV PBR_VERSION 0.1a1
|
||||||
|
|
||||||
# Shipyard source and installation
|
# Shipyard source and installation
|
||||||
COPY ${ctx_base}/shipyard_client /home/shipyard/shipyard_client/
|
COPY ${ctx_base}/shipyard_client /home/shipyard/shipyard_client/
|
||||||
RUN cd /home/shipyard/shipyard_client \
|
RUN cd /home/shipyard/shipyard_client \
|
||||||
&& python3 setup.py install
|
&& python3 setup.py install
|
||||||
|
|
||||||
COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
|
COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
|
||||||
RUN cd /home/shipyard/shipyard \
|
RUN cd /home/shipyard/shipyard \
|
||||||
&& python3 setup.py install
|
&& python3 setup.py install
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
[metadata]
|
||||||
|
name = shipyard_airflow
|
||||||
|
summary = Directed acyclic graph controller for Kubernetes and OpenStack control plane life cycle management
|
||||||
|
description-file = README.md
|
||||||
|
author = The Airship Authors
|
||||||
|
home-page = https://airship-shipyard.readthedocs.io/
|
||||||
|
|
||||||
|
classifier =
|
||||||
|
Intended Audience :: Information Technology
|
||||||
|
Intended Audience :: System Administrators
|
||||||
|
License :: OSI Approved :: Apache Software License
|
||||||
|
Operating System :: POSIX :: Linux
|
||||||
|
Programming Language :: Python
|
||||||
|
Programming Language :: Python :: 3
|
||||||
|
Programming Language :: Python :: 3.5
|
||||||
|
Programming Language :: Python :: 3.6
|
||||||
|
|
||||||
|
[files]
|
||||||
|
packages =
|
||||||
|
shipyard_airflow
|
||||||
|
|
||||||
|
[entry_points]
|
||||||
|
oslo.config.opts =
|
||||||
|
shipyard_api = shipyard_airflow.conf.opts:list_opts
|
||||||
|
|
||||||
|
oslo.policy.policies =
|
||||||
|
shipyard_api = shipyard_airflow.policy:list_policies
|
||||||
|
|
||||||
|
console_scripts =
|
||||||
|
upgrade_db = shipyard_airflow.shipyard_upgrade_db:upgrade_db
|
|
@ -15,30 +15,5 @@
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name='shipyard_api',
|
setup_requires=['pbr>=2.0.0'],
|
||||||
version='0.1a1',
|
pbr=True)
|
||||||
description=('Directed acyclic graph controller for Kubernetes and '
|
|
||||||
'OpenStack control plane life cycle management'),
|
|
||||||
url='https://github.com/openstack/airship-shipyard',
|
|
||||||
author='The Airship Authors',
|
|
||||||
license='Apache 2.0',
|
|
||||||
packages=setuptools.find_packages(),
|
|
||||||
entry_points={
|
|
||||||
'oslo.config.opts':
|
|
||||||
'shipyard_api = shipyard_airflow.conf.opts:list_opts',
|
|
||||||
'oslo.policy.policies':
|
|
||||||
'shipyard_api = shipyard_airflow.policy:list_policies',
|
|
||||||
'console_scripts':
|
|
||||||
'upgrade_db = shipyard_airflow.shipyard_upgrade_db:upgrade_db',
|
|
||||||
},
|
|
||||||
classifiers=[
|
|
||||||
'Intended Audience :: Information Technology',
|
|
||||||
'Intended Audience :: System Administrators',
|
|
||||||
'License :: OSI Approved :: Apache Software License',
|
|
||||||
'Operating System :: POSIX :: Linux',
|
|
||||||
'Programming Language :: Python',
|
|
||||||
'Programming Language :: Python :: 3',
|
|
||||||
'Programming Language :: Python :: 3.5',
|
|
||||||
'Programming Language :: Python :: 3.6',
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
[metadata]
|
||||||
|
name = shipyard_client
|
||||||
|
summary = CLI for shipyard
|
||||||
|
description-file = README.md
|
||||||
|
author = The Airship Authors
|
||||||
|
home-page = https://airship-shipyard.readthedocs.io/
|
||||||
|
|
||||||
|
classifier =
|
||||||
|
Intended Audience :: Information Technology
|
||||||
|
Intended Audience :: System Administrators
|
||||||
|
License :: OSI Approved :: Apache Software License
|
||||||
|
Operating System :: POSIX :: Linux
|
||||||
|
Programming Language :: Python
|
||||||
|
Programming Language :: Python :: 3
|
||||||
|
Programming Language :: Python :: 3.5
|
||||||
|
Programming Language :: Python :: 3.6
|
||||||
|
|
||||||
|
[files]
|
||||||
|
packages =
|
||||||
|
shipyard_client
|
||||||
|
|
||||||
|
[entry_points]
|
||||||
|
console_scripts =
|
||||||
|
shipyard = shipyard_client.cli.commands:shipyard
|
|
@ -15,25 +15,5 @@
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name='shipyard_client',
|
setup_requires=['pbr>=2.0.0'],
|
||||||
version='0.1a1',
|
pbr=True)
|
||||||
description='CLI for Shipyard',
|
|
||||||
url='https://github.com/openstack/airship-shipyard',
|
|
||||||
author='The Airship Authors',
|
|
||||||
license='Apache 2.0',
|
|
||||||
packages=setuptools.find_packages(),
|
|
||||||
entry_points={
|
|
||||||
'console_scripts':
|
|
||||||
'shipyard = shipyard_client.cli.commands:shipyard'
|
|
||||||
},
|
|
||||||
classifiers=[
|
|
||||||
'Intended Audience :: Information Technology',
|
|
||||||
'Intended Audience :: System Administrators',
|
|
||||||
'License :: OSI Approved :: Apache Software License',
|
|
||||||
'Operating System :: POSIX :: Linux',
|
|
||||||
'Programming Language :: Python',
|
|
||||||
'Programming Language :: Python :: 3',
|
|
||||||
'Programming Language :: Python :: 3.5',
|
|
||||||
'Programming Language :: Python :: 3.6',
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in New Issue