From: Haibin Huang <haibin.huang@intel.com>
Date: Thu, 5 Mar 2020 02:07:24 +0000 (+0800)
Subject: Fix hpa docker failure
X-Git-Tag: 1.5.4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=906a27d95d0e781c5906ed7402abc12411b2851d;p=multicloud%2Fopenstack.git

Fix hpa docker failure

Issue-ID: MULTICLOUD-1020
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Change-Id: I2dad4851345339e5737b41722720dc3538e1c7fa
---

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',