diff options
author | Haibin Huang <haibin.huang@intel.com> | 2020-03-05 10:07:24 +0800 |
---|---|---|
committer | Haibin Huang <haibin.huang@intel.com> | 2020-03-05 10:47:10 +0800 |
commit | 987fdf56d3d77d287c10c8d4c5ff104fee2df9b3 (patch) | |
tree | c46e6f9e96c945cb7862f7211ed4a56a44bb8a7e | |
parent | 9ecaed51d700a669259ab78b55dc57e12f4025d5 (diff) |
Fix hpa docker failure1.5.4
Issue-ID: MULTICLOUD-1020
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Change-Id: I2dad4851345339e5737b41722720dc3538e1c7fa
-rw-r--r-- | hpa/README.md | 2 | ||||
-rw-r--r-- | hpa/pom.xml | 23 | ||||
-rw-r--r-- | hpa/setup.py | 4 |
3 files changed, 1 insertions, 28 deletions
diff --git a/hpa/README.md b/hpa/README.md index fe568ad6..6b17a784 100644 --- a/hpa/README.md +++ b/hpa/README.md @@ -1,6 +1,6 @@ # 1. compile hpa plugin cd hpa -python setup.py compile +python setup.py build # 2. install hpa plugin cd hpa diff --git a/hpa/pom.xml b/hpa/pom.xml index 8e2b1ed7..06e7eb78 100644 --- a/hpa/pom.xml +++ b/hpa/pom.xml @@ -160,29 +160,6 @@ <execution> <phase>install</phase> <inherited>false</inherited> - <configuration> - <target> - <exec executable="docker"> - <arg value="build"/> - <arg value="-t"/> - <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-hpa:${project.version}"/> - <arg value="docker_target"/> - </exec> - <exec executable="docker"> - <arg value="tag"/> - <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-hpa:${project.version}"/> - <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-hpa:latest"/> - </exec> - <exec executable="docker"> - <arg value="push"/> - <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-hpa:${project.version}"/> - </exec> - <exec executable="docker"> - <arg value="push"/> - <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-hpa:latest"/> - </exec> - </target> - </configuration> <goals> <goal>run</goal> </goals> diff --git a/hpa/setup.py b/hpa/setup.py index d7291cec..7fd5ba1a 100644 --- a/hpa/setup.py +++ b/hpa/setup.py @@ -1,14 +1,10 @@ from setuptools import setup, find_packages -with open("README.md", "r") as fh: - long_description = fh.read() - setup( name='onaphpadriver', version='1.0', description='HPA discovery package for stevedore', - long_description=long_description, author='Haibin Huang', author_email='haibin.huang@intel.com', |