diff --git a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm index 6b388a9..7f922f8 100644 Binary files a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm and b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_cluster/tasks/main.yml b/roles/oam_cluster/tasks/main.yml index 76bc72e..11188d0 100644 --- a/roles/oam_cluster/tasks/main.yml +++ b/roles/oam_cluster/tasks/main.yml @@ -9,6 +9,17 @@ - /tmp/oam_cluster-1.0-1.0.x86_64.rpm state: present + +- name: "Templates application-centos2.properties" + template: + src: "{{role_path}}/templates/application-centos2.properties.j2" + dest: /opt/tsg/oam_cluster/application-centos2.properties + +- name: "Templates application.properties" + template: + src: "{{role_path}}/templates/application.properties.j2" + dest: /opt/tsg/oam_cluster/application.properties + - name: "Start oam_cluster" systemd: name: oam_cluster diff --git a/roles/oam_cluster/templates/application-centos2.properties.j2 b/roles/oam_cluster/templates/application-centos2.properties.j2 new file mode 100644 index 0000000..879ca42 --- /dev/null +++ b/roles/oam_cluster/templates/application-centos2.properties.j2 @@ -0,0 +1,3 @@ +spring.datasource.password={{ mariadb.password }} +server.port=50080 +oam.cluster.db.ip={{ mariadb.cluster_ip }} \ No newline at end of file diff --git a/roles/oam_cluster/templates/application.properties.j2 b/roles/oam_cluster/templates/application.properties.j2 new file mode 100644 index 0000000..559a83b --- /dev/null +++ b/roles/oam_cluster/templates/application.properties.j2 @@ -0,0 +1,34 @@ +spring.profiles.active=centos2 +server.port=50081 + +# datasource +spring.datasource.platform=mysql +spring.datasource.url=jdbc:mysql://{{ mariadb.cluster_ip }}/tsg_cluster?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true +spring.datasource.username=root +spring.datasource.password=123456 +spring.datasource.driverClassName=com.mysql.jdbc.Driver +# Advanced configuration... +spring.datasource.max-active=50 +spring.datasource.max-idle=6 +spring.datasource.min-idle=2 +spring.datasource.initial-size=6 + +#create table +spring.jpa.hibernate.ddl-auto=update +#spring.jpa.database=MYSQL +spring.jpa.show-sql = true +# JPA\u4e0d\u4f7f\u7528\u9ed8\u8ba4\u7684\u9a7c\u5cf0\u89c4\u5219\u6620\u5c04\u5b9e\u4f53 +spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect + +oam.cluster.db.ip={{ mariadb.cluster_ip }} +oam.ping.timeout=2500 +#RestTemplate timeout in millis +oam.rest.connection.connection-request-timeout=${oam.ping.timeout} +oam.rest.connection.connect-timeout=${oam.ping.timeout} +oam.rest.connection.read-timeout=${oam.ping.timeout} + +logging.file=oam-cluster.log +logging.file.max-size=10MB +logging.file.max-history=10 diff --git a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm index e8f90ba..f7316a3 100644 Binary files a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm and b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_core/templates/application-centos2.properties.j2 b/roles/oam_core/templates/application-centos2.properties.j2 index b71d038..3318b86 100644 --- a/roles/oam_core/templates/application-centos2.properties.j2 +++ b/roles/oam_core/templates/application-centos2.properties.j2 @@ -47,10 +47,13 @@ datasource.second.password={{ mariadb.password }} oam.writer.scheduler.interval=60000 oam.writer.scheduler.ipmi.interval=180000 +logging.level.com.tsg.oam=ERROR logging.level.com.cs.oam=ERROR # Absolute path oam.rest.oam_core=/opt/tsg/oam_core/application-centos2.properties oam.rest.oam_snmp=/opt/tsg/snmp/application.properties +oam.rest.oam_snmp_user=/opt/tsg/snmp/AgentConfig.properties #oam.rest.cli_agent=opt/tsg/snmp/application-centos2.properties oam.rest.cli=/home/tsgroot/opt/tsg/cli/application.properties + diff --git a/roles/oam_snmp/files/snmpd.conf b/roles/oam_snmp/files/snmpd.conf index cd8268d..e4082e8 100755 --- a/roles/oam_snmp/files/snmpd.conf +++ b/roles/oam_snmp/files/snmpd.conf @@ -56,6 +56,13 @@ view systemview included .1.3.6.1.2.1.1 view systemview included .1.3.6.1.2.1.25.1.1 view systemview included .1.3.6.1.4.1.2021 +view systemview included .1.3.6.1.4.1.2021.10.1.3 +view systemview included .1.3.6.1.4.1.2021.11 +view systemview included .1.3.6.1.4.1.2021.4 +view systemview included .1.3.6.1.4.1.2021.9.1 +#view systemview included .1.3.6.1.4.1.54450 +disk / 10000 +includeAllDisks 10% #### # Finally, grant the group read-only access to the systemview view.