diff options
| -rw-r--r-- | install_config/group_vars/all.yml | 1 | ||||
| -rwxr-xr-x | roles/oam_cli/templates/application.properties.j2 | 2 | ||||
| -rw-r--r-- | roles/oam_core/templates/application-centos2.properties.j2 | 6 | ||||
| -rw-r--r-- | roles/oam_snmp/tasks/main.yml | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml index d17ee00..9f0ccd9 100644 --- a/install_config/group_vars/all.yml +++ b/install_config/group_vars/all.yml @@ -30,3 +30,4 @@ oam: java_version: jdk1.8.0_73 bifang_api_ip: "10.3.60.7" +bifang_api_port: 8080 diff --git a/roles/oam_cli/templates/application.properties.j2 b/roles/oam_cli/templates/application.properties.j2 index 324c55e..36baaf7 100755 --- a/roles/oam_cli/templates/application.properties.j2 +++ b/roles/oam_cli/templates/application.properties.j2 @@ -17,7 +17,7 @@ oam.influx.password={{ influxdb.passwd }} oam.cli.user.admin=tsgadmin oam.cli.user.user=tsguser -cli.rest.root=http://{{ bifang_api_ip }}:8080/v1 +cli.rest.root=http://{{ bifang_api_ip }}:{{ bifang_api_port }}/v1 cli.rest.login=${cli.rest.root}/user/login cli.rest.policy=${cli.rest.root}/policy/compile cli.rest.policy.object=${cli.rest.root}/policy/object diff --git a/roles/oam_core/templates/application-centos2.properties.j2 b/roles/oam_core/templates/application-centos2.properties.j2 index 2bdc958..417af84 100644 --- a/roles/oam_core/templates/application-centos2.properties.j2 +++ b/roles/oam_core/templates/application-centos2.properties.j2 @@ -37,11 +37,11 @@ oam.influx.port=58086 oam.writer.influxcluster.db={{ influxdb.dbname }}
# datasource - local
-datasource.first.password={{ influxdb.passwd }}
+datasource.first.password={{ mariadb.password }}
# datasource - cluster
-datasource.second.username=root
-datasource.second.password=111111
+datasource.second.username={{ mariadb.username }}
+datasource.second.password={{ mariadb.password }}
oam.writer.scheduler.interval=60000
diff --git a/roles/oam_snmp/tasks/main.yml b/roles/oam_snmp/tasks/main.yml index e782228..e868834 100644 --- a/roles/oam_snmp/tasks/main.yml +++ b/roles/oam_snmp/tasks/main.yml @@ -29,8 +29,10 @@ copy: src: "{{role_path}}/files/snmpd.conf" dest: /etc/snmp/ + mode: 0755 - name: "copy snmptrapd conf" copy: src: "{{role_path}}/files/snmptrapd.conf" dest: /etc/snmp/ + mode: 0755 |