19 files changed, 10 insertions, 34 deletions
diff --git a/installation/ansible-server/src/main/.dockerignore b/installation/ansible-server/src/main/.dockerignore
new file mode 100644
index 00000000..0d20b648
--- /dev/null
+++ b/installation/ansible-server/src/main/.dockerignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/installation/ansible-server/src/main/Dockerfile b/installation/ansible-server/src/main/Dockerfile
new file mode 100644
index 00000000..726d6065
--- /dev/null
+++ b/installation/ansible-server/src/main/Dockerfile
@@ -0,0 +1,6 @@
+#FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version}
+FROM onap/ccsdk-ansible-server-image:0.4-STAGING-latest
+
+LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
+
+COPY Playbooks /opt/ansible-server/Playbooks
diff --git a/installation/ansible-server/src/main/yml/Ansible_inventory b/installation/ansible-server/src/main/Playbooks/Ansible_inventory
index 69df84ff..4fffb37f 100644
--- a/installation/ansible-server/src/main/yml/Ansible_inventory
+++ b/installation/ansible-server/src/main/Playbooks/Ansible_inventory
@@ -17,11 +17,10 @@
 # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
-# * 
+# *
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # * ============LICENSE_END=========================================================
 # */
 
 [host]
 localhost   ansible_connection=local
-
diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.00.yml
index 0711e40a..0711e40a 100644
--- a/installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.00.yml
index b6614b65..b6614b65 100644
--- a/installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.00.yml
index 87e84ab1..87e84ab1 100644
--- a/installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_postcheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_postcheck@0.00.yml
index 199bc50c..199bc50c 100644
--- a/installation/ansible-server/src/main/yml/ansible_postcheck@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_postcheck@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_postcheck_jq@0.00.yml
index 18d20edf..18d20edf 100755
--- a/installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_postcheck_jq@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_precheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_precheck@0.00.yml
index e596aa29..e596aa29 100644
--- a/installation/ansible-server/src/main/yml/ansible_precheck@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_precheck@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_precheck_jq@0.00.yml
index 00470807..00470807 100755
--- a/installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_precheck_jq@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_pyver@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_pyver@0.00.yml
index ad90e54b..ad90e54b 100644
--- a/installation/ansible-server/src/main/yml/ansible_pyver@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_pyver@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_quiescetraffic@0.00.yml
index 000bc488..000bc488 100755
--- a/installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_quiescetraffic@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_resumetraffic@0.00.yml
index 32ebfc94..32ebfc94 100755
--- a/installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_resumetraffic@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_sleep@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_sleep@0.00.yml
index aba2919e..345f5e49 100644
--- a/installation/ansible-server/src/main/yml/ansible_sleep@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_sleep@0.00.yml
@@ -17,14 +17,14 @@
 # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
-# * 
+# *
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # * ============LICENSE_END=========================================================
 # */
 
 - hosts: all
 
-  # Mandatory: 
+  # Mandatory:
   vars:
       sleep_time: "{{Sleep|default(10)}}"
 
@@ -39,4 +39,3 @@
 
     - debug:
         msg: "Done"
-
diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw@0.00.yml
index 886705db..886705db 100644
--- a/installation/ansible-server/src/main/yml/ansible_upgradesw@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw_insjq@0.00.yml
index ec1d2de6..ec1d2de6 100755
--- a/installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw_insjq@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw_remjq@0.00.yml
index c5be6330..c5be6330 100755
--- a/installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw_remjq@0.00.yml
diff --git a/installation/ansible-server/src/main/yml/ansible_vfw_distributetraffic@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_vfw_distributetraffic@0.00.yml
index aeffe62f..aeffe62f 100644
--- a/installation/ansible-server/src/main/yml/ansible_vfw_distributetraffic@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_vfw_distributetraffic@0.00.yml
diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile
deleted file mode 100644
index 0e59fba8..00000000
--- a/installation/ansible-server/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version}
-
-LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
-
-#ENV http_proxy=http://anonymous:password@one.proxy.att.com:8080
-#ENV https_proxy=http://anonymous:password@one.proxy.att.com:8080
-
-##Vim
-RUN apt-get update
-RUN apt-get -y install apt-file
-RUN apt-file update
-RUN apt-get -y install vim
-
-##Python:
-RUN apt-get -y install python2.7
-RUN apt-get -y install python-pip
-
-
-
-# copy files needed
-COPY opt /opt/
-
-WORKDIR /opt/onap/ccsdk
-
-#ENTRYPOINT exec startAnsibleServer.sh
-#CMD ["/bin/bash"]
-EXPOSE 8000
-