diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/ansible-server/pom.xml | 2 | ||||
| -rw-r--r-- | installation/ansible-server/src/main/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | installation/dgbuilder/.gitignore | 1 | ||||
| -rw-r--r-- | installation/sdnc/src/main/resources/sdnctl.dump | 13 | ||||
| -rw-r--r-- | installation/src/main/yaml/docker-compose.yml | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index e5e78019..593c5aee 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -88,7 +88,7 @@ </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/Playbooks</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks</outputDirectory> <resources> <resource> <directory>src/main/yml</directory> diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile index cc93f12a..ea9e61b7 100644 --- a/installation/ansible-server/src/main/docker/Dockerfile +++ b/installation/ansible-server/src/main/docker/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get -y install python-pip # copy files needed COPY opt /opt/ -WORKDIR /opt/onap/sdnc +WORKDIR /opt/onap/ccsdk #ENTRYPOINT exec startAnsibleServer.sh #CMD ["/bin/bash"] diff --git a/installation/dgbuilder/.gitignore b/installation/dgbuilder/.gitignore new file mode 100755 index 00000000..ed7fb70f --- /dev/null +++ b/installation/dgbuilder/.gitignore @@ -0,0 +1 @@ +releases
\ No newline at end of file diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump index 9949c88c..04a9ad73 100644 --- a/installation/sdnc/src/main/resources/sdnctl.dump +++ b/installation/sdnc/src/main/resources/sdnctl.dump @@ -989,6 +989,9 @@ DROP TABLE IF EXISTS `GENERIC_RESOURCE_NAME`; CREATE TABLE `GENERIC_RESOURCE_NAME` ( `type` varchar(50) NOT NULL, `name` varchar(255) NOT NULL, + `prefix` varchar(255) NULL, + `name_index` int(11) NULL, + `content_id` varchar(255) NULL, PRIMARY KEY (`type`,`name`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; @@ -3295,6 +3298,16 @@ CREATE TABLE `DHCP_MAP` ( PRIMARY KEY (`mac_addr`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +DROP TABLE IF EXISTS `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING`; +CREATE TABLE `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING` ( + `group_uuid` varchar(255) NOT NULL, + `parent_uuid` varchar(255) NOT NULL, + `target_node_uuid` varchar(255) NOT NULL, + `target_type` varchar(255) NULL, + `table_name` varchar(255) NULL, + PRIMARY KEY (`group_uuid`, `parent_uuid`, `target_node_uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 361e7ea8..38522518 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -27,7 +27,7 @@ services: depends_on : - db container_name: sdnc_ansible_container - entrypoint: ["/opt/onap/sdnc/startAnsibleServer.sh"] + entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"] ports: - "8000" links: |