clean up
diff --git a/.gitignore b/.gitignore index 6d5a6b8..48dcfc1 100644 --- a/.gitignore +++ b/.gitignore
@@ -112,3 +112,4 @@ *retry *.db *~ +ansible.cfg
diff --git a/ansible.cfg b/ansible.cfg old mode 100755 new mode 100644 index 46e5c8f..5babd93 --- a/ansible.cfg +++ b/ansible.cfg
@@ -1,11 +1,10 @@ [defaults] -hostfile = ~/.ansible/inventory/vz-edge-1701-aio -fact_caching_connection = ~/.ansible/tmp/cache/vz-edge-1701-aio -log_path = ~/.ansible/tmp/logs/vz-edge-1701-aio.log +hostfile = ~/.ansible/inventory/ +fact_caching_connection = ~/.ansible/tmp/cache/ +log_path = ~/.ansible/tmp/logs/ansible-default.log -remote_user = friasca +# remote_user = friasc private_key_file = ~/.ssh/id_rsa -become_method = pbrun roles_path = ~/.ansible/roles local_tmp = ~/.ansible/tmp
diff --git a/repository-custom-properties.yml b/repository-custom-properties.yml index 5c1d831..c31db5d 100644 --- a/repository-custom-properties.yml +++ b/repository-custom-properties.yml
@@ -4,8 +4,8 @@ apigee_workspace: ~/apigee-workspace playbook_workspace: "{{ apigee_workspace }}/apigee-opdk-playbook-workspace" role_workspace: "{{ apigee_workspace }}/apigee-opdk-role-workspace" -repository_secure_endpoint_https: "https://onestash.verizon.com/rest/api/1.0/projects/CELVW" -repository_secure_endpoint_ssh: "ssh://git@onestash.verizon.com:7999/celvw" +repository_secure_endpoint_https: https://github.com/carlosfrias +repository_secure_endpoint_ssh: git@github.com:carlosfrias configuration_folders: - '{{ ansible_config }}/configurations' - '{{ ansible_config }}/inventory'
diff --git a/resources/ansible.cfg.j2 b/resources/ansible.cfg.j2 index 465176d..6f27390 100644 --- a/resources/ansible.cfg.j2 +++ b/resources/ansible.cfg.j2
@@ -1,11 +1,10 @@ [defaults] hostfile = {{ ansible_config }}/inventory/ fact_caching_connection = {{ ansible_config }}/tmp/cache/ -log_path = {{ ansible_config }}/tmp/logs/ +log_path = {{ ansible_config }}/tmp/logs/ansible-default.log -remote_user = {{ username }} +# remote_user = {{ username }} private_key_file = ~/.ssh/id_rsa -become_method = pbrun roles_path = {{ ansible_config }}/roles local_tmp = {{ ansible_config }}/tmp
diff --git a/setup-ansible-config.yml b/setup-ansible-config.yml index 906f845..d4ff2d1 100644 --- a/setup-ansible-config.yml +++ b/setup-ansible-config.yml
@@ -5,7 +5,7 @@ - repository-custom-properties.yml vars_prompt: - name: username - prompt: "Enter your username ID" + prompt: "Enter your the username for ansible" private: no tasks: - name: Create ansible.cfg file from template
diff --git a/setup.yml b/setup.yml index 6899461..d391fc6 100644 --- a/setup.yml +++ b/setup.yml
@@ -1,4 +1,6 @@ --- +- include: setup-ansible-config.yml + #- include: control-server.yml - include: setup-base.yml