From f7c876678a4ddcd70ff40e66f01279034b0f8134 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 12 Jul 2021 10:56:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E9=87=8D=E6=9E=84tsg-os-provison?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/{tsg-os-provision => }/hosts | 0 .../adapt_tera_network_setting.sh.j2 | 0 .../setup_policy_log_nic_network.sh.j2 | 0 .../files/tasks/provision.yml.7400MCN0P01R01 | 6 +- .../tasks/provision.yml.7400MCN123P01R01 | 2 +- .../files/tasks/provision.yml.9000NPBP01R01 | 2 +- .../files/tsg-os-provision/files/.gitkeep | 0 .../tsg-os-provision/provision.yml.sample | 75 ------------------- .../tsg-os-provision/tasks/provision.yml | 8 -- .../files/tsg-os-provision/templates/.gitkeep | 0 ansible/roles/tsg-os-provision/tasks/main.yml | 25 ++++++- ansible/roles/tsg_sn/files/obtain_sn.sh | 4 +- ansible/roles/tsg_sn/tasks/main.yml | 2 +- 13 files changed, 30 insertions(+), 94 deletions(-) rename ansible/roles/tsg-os-provision/files/{tsg-os-provision => }/hosts (100%) rename ansible/roles/tsg-os-provision/files/{tsg-os-provision/templates => network_settings}/adapt_tera_network_setting.sh.j2 (100%) rename ansible/roles/tsg-os-provision/files/{tsg-os-provision/templates => network_settings}/setup_policy_log_nic_network.sh.j2 (100%) delete mode 100644 ansible/roles/tsg-os-provision/files/tsg-os-provision/files/.gitkeep delete mode 100644 ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample delete mode 100644 ansible/roles/tsg-os-provision/files/tsg-os-provision/tasks/provision.yml delete mode 100644 ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/.gitkeep diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/hosts b/ansible/roles/tsg-os-provision/files/hosts similarity index 100% rename from ansible/roles/tsg-os-provision/files/tsg-os-provision/hosts rename to ansible/roles/tsg-os-provision/files/hosts diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/adapt_tera_network_setting.sh.j2 b/ansible/roles/tsg-os-provision/files/network_settings/adapt_tera_network_setting.sh.j2 similarity index 100% rename from ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/adapt_tera_network_setting.sh.j2 rename to ansible/roles/tsg-os-provision/files/network_settings/adapt_tera_network_setting.sh.j2 diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 b/ansible/roles/tsg-os-provision/files/network_settings/setup_policy_log_nic_network.sh.j2 similarity index 100% rename from ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 rename to ansible/roles/tsg-os-provision/files/network_settings/setup_policy_log_nic_network.sh.j2 diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 index 3346ee19..84e8e475 100644 --- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 @@ -28,12 +28,12 @@ - name: "template adapt_tera_network_setting.sh when NPB device is tera" template: src: ../templates/adapt_tera_network_setting.sh.j2 - dest: /opt/tsg/tsg-os-provision/adapt_tera_network_setting.sh + dest: /opt/tsg/tsg-os-provision/exec/adapt_tera_network_setting.sh mode: 0755 when: npb_device == 'tera' - name: "execute adapt_tera_network_setting.sh when NPB device is tera" - shell: /opt/tsg/tsg-os-provision/adapt_tera_network_setting.sh + shell: /opt/tsg/tsg-os-provision/exec/adapt_tera_network_setting.sh register: result_exec_adapt_tera_network_setting when: npb_device == 'tera' @@ -163,7 +163,7 @@ state: directory - name: "tsg-os-provision: obtain sn from mxn and write sn to tsg_sn.json" - shell: /opt/tsg/tsg-os-provision/obtain_sn.sh 192.168.100.5 + shell: /opt/tsg/tsg-os-provision/exec/obtain_sn.sh 192.168.100.5 register: result_exec_obtain_sn_and_write_sn_in_file - name: "tsg-os-provision: check result_exec_obtain_sn_and_write_sn_in_file" diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 index 67fc35a6..c0c61d45 100644 --- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 +++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01 @@ -31,7 +31,7 @@ success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines }}" - name: "tsg-os-provision: obtain sn from mxn and write sn to tsg_sn.json" - shell: /opt/tsg/tsg-os-provision/obtain_sn.sh 192.168.100.5 + shell: /opt/tsg/tsg-os-provision/exec/obtain_sn.sh 192.168.100.5 register: result_exec_obtain_sn_and_write_sn_in_file - name: "tsg-os-provision: check result_exec_obtain_sn_and_write_sn_in_file" diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01 index 8af4bac9..57dfd621 100644 --- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01 @@ -9,7 +9,7 @@ state: directory - name: "tsg-os-provision: obtain sn" - shell: /opt/tsg/tsg-os-provision/obtain_sn.sh 127.0.0.1 + shell: /opt/tsg/tsg-os-provision/exec/obtain_sn.sh 127.0.0.1 register: result_exec_obtain_sn_and_write_sn_in_file - name: "tsg-os-provision: check result_exec_obtain_sn_and_write_sn_in_file" diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/files/.gitkeep b/ansible/roles/tsg-os-provision/files/tsg-os-provision/files/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample deleted file mode 100644 index a0258e7b..00000000 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample +++ /dev/null @@ -1,75 +0,0 @@ -version: 1 - -cm: - policy_server: - address: "127.0.0.1" - port_range: 7002 - port_num: 1 - db_static: 0 - db_dynamic: 1 - -sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 - - -data_center: - name: City instance - id: 1 - - -olap: - kafka_broker: - address_list: ['1.1.1.1:9092','2.2.2.2:9092'] - hos_server: - address: "127.0.0.1" - port: 9098 - -app_sketch: - broker: - address: "127.0.0.1" - port: 1883 - -cache: - hos: - address: "127.0.0.1" - port: 9090 - - -# npb_device value in [inline_device, tera,direct] -npb_device: inline_device - -tera_steering_group: - - internal: - vlan_id: 1301 - keepalive: - ipv4: 127.0.0.1/24 - ipv6: 'fe80\:\:1/64' - external: - vlan_id: 1302 - keepalive: - ipv4: 127.0.0.1/24 - ipv6: 'fe80\:\:2/64' - - internal: - vlan_id: 1201 - keepalive: - ipv4: 127.0.0.1/24 - ipv6: 'fe80\:\:3/64' - external: - vlan_id: 1202 - keepalive: - ipv4: 127.0.0.1/24 - ipv6: 'fe80\:\:4/64' - -inline_device_settings: - keepalive: - ip: 127.0.0.1 - mask: 255.255.255.0 - - -feature: - enable_policy_local_cache: 1 - -network_setting: - nic_policy_log: - ipv4: 127.0.0.1/24 - ipv6: 'fe80\:\:5/64' - gateway_ipv4: 191.168.1.1 \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/tasks/provision.yml b/ansible/roles/tsg-os-provision/files/tsg-os-provision/tasks/provision.yml deleted file mode 100644 index 6f22073c..00000000 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/tasks/provision.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: provision - vars_files: - - '{{var_files_path}}' - tasks: - - name: "tsg-os-provision: Nothing to do, exit error code" - fail: - msg: "Error: There are nothing to do,maybe some errors occurred during the os-building..." \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/.gitkeep b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/ansible/roles/tsg-os-provision/tasks/main.yml b/ansible/roles/tsg-os-provision/tasks/main.yml index 0afd6e0a..32b14fbe 100644 --- a/ansible/roles/tsg-os-provision/tasks/main.yml +++ b/ansible/roles/tsg-os-provision/tasks/main.yml @@ -1,9 +1,28 @@ -- name: "tsg-os-provision: copy tsg-os-provision scripts to dest" +- name: "tsg-os-provision: build tsg-os-provision directory and sub directory" + file: + path: "{{ item }}" + state: directory + with_items: + - "/opt/tsg/tsg-os-provision/" + - "/opt/tsg/tsg-os-provision/files/" + - "/opt/tsg/tsg-os-provision/tasks/" + - "/opt/tsg/tsg-os-provision/templates/" + - "/opt/tsg/tsg-os-provision/exec/" + +- name: "tsg-os-provision: copy hosts file dest" copy: - src: "{{ role_path }}/files/tsg-os-provision" - dest: /opt/tsg/ + src: "{{ role_path }}/files/hosts" + dest: /opt/tsg/tsg-os-provision/hosts mode: 0644 +- name: "tsg-os-provision: template network settings shell" + copy: + src: "{{ role_path }}/files/network_settings/{{ item }}" + dest: "/opt/tsg/tsg-os-provision/templates/" + with_items: + - adapt_tera_network_setting.sh.j2 + - setup_policy_log_nic_network.sh.j2 + - name: "tsg-os-provision: copy tasks file that excutes provision to dest - tsg9140" copy: src: "{{ role_path }}/files/tasks/provision.yml.9000NPBP01R01" diff --git a/ansible/roles/tsg_sn/files/obtain_sn.sh b/ansible/roles/tsg_sn/files/obtain_sn.sh index fa42139f..7f107934 100644 --- a/ansible/roles/tsg_sn/files/obtain_sn.sh +++ b/ansible/roles/tsg_sn/files/obtain_sn.sh @@ -7,12 +7,12 @@ if [ $ip_of_obtain_sn == '127.0.0.1' ];then exit 0 fi -if [ ! -f "/opt/tsg/tsg-os-provision/cmm_api_tst" ];then +if [ ! -f "/opt/tsg/tsg-os-provision/exec/cmm_api_tst" ];then echo "not found cmm_api_tst!" exit 1 fi -/opt/tsg/tsg-os-provision/cmm_api_tst 9 1 1 $ip_of_obtain_sn | tee chid.id +/opt/tsg/tsg-os-provision/exec/cmm_api_tst 9 1 1 $ip_of_obtain_sn | tee chid.id if [ $? != 0 ]; then echo "cmm_api_tst failed!" exit 1 diff --git a/ansible/roles/tsg_sn/tasks/main.yml b/ansible/roles/tsg_sn/tasks/main.yml index 82172f51..4136173c 100644 --- a/ansible/roles/tsg_sn/tasks/main.yml +++ b/ansible/roles/tsg_sn/tasks/main.yml @@ -2,7 +2,7 @@ - name: "deploy obtain sn" copy: src: "{{ item }}" - dest: /opt/tsg/tsg-os-provision/ + dest: /opt/tsg/tsg-os-provision/exec/ mode: 0755 with_items: - "{{ role_path }}/files/obtain_sn.sh"