Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenca committed Oct 17, 2019
1 parent 6855764 commit d5f0304
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -38,7 +38,7 @@ docker build -t ansible-sdwan .

#### Running the the playbooks in the docker container

In order to make this easier, a bash script has also been provided:
In order to make this easier, a bash script has also been provided. To run a playbook specified in the directions, you can run:

```bash
./play.sh <playbook> <options>
Expand Down Expand Up @@ -83,7 +83,7 @@ inventory = ./inventory/crn1

or specify `-i` with every command (e.g. `./play.sh -i inventory/hq1 build-cml.yml`)

The local defaults for all inventories are set in `sdwan-devops\group_vars/all/local/yml`
The local defaults for all inventories are set in `sdwan-devops/group_vars/all/local/yml`

### Variables

Expand Down
20 changes: 10 additions & 10 deletions build-ca.yml
Expand Up @@ -9,27 +9,27 @@
tasks:
- name: Ensure directory exists for local self-signed TLS certs.
file:
path: "{{ viptela_cert_dir }}"
path: "{{ sdwan_cert_dir }}"
state: directory

- name: Generate an OpenSSL private key.
openssl_privatekey:
cipher: des3
passphrase: "{{ viptela_CA_passphrase }}"
path: "{{ viptela_cert_dir }}/myCA.key"
passphrase: "{{ sdwan_CA_passphrase }}"
path: "{{ sdwan_cert_dir }}/myCA.key"

- name: Generate an OpenSSL CSR.
openssl_csr:
path: "{{ viptela_cert_dir }}/myCA.csr"
privatekey_path: "{{ viptela_cert_dir }}/myCA.key"
privatekey_passphrase: "{{ viptela_CA_passphrase }}"
path: "{{ sdwan_cert_dir }}/myCA.csr"
privatekey_path: "{{ sdwan_cert_dir }}/myCA.key"
privatekey_passphrase: "{{ sdwan_CA_passphrase }}"
common_name: viptelaCA.local

- name: Generate a Self Signed OpenSSL certificate.
openssl_certificate:
path: "{{ viptela_cert_dir }}/myCA.pem"
privatekey_path: "{{ viptela_cert_dir }}/myCA.key"
privatekey_passphrase: "{{ viptela_CA_passphrase }}"
csr_path: "{{ viptela_cert_dir }}/myCA.csr"
path: "{{ sdwan_cert_dir }}/myCA.pem"
privatekey_path: "{{ sdwan_cert_dir }}/myCA.key"
privatekey_passphrase: "{{ sdwan_CA_passphrase }}"
csr_path: "{{ sdwan_cert_dir }}/myCA.csr"
# select_crypto_backend: pyopenssl
provider: selfsigned
2 changes: 1 addition & 1 deletion docs/virl.md
Expand Up @@ -64,7 +64,7 @@ export VMANAGE_ORG=myorgname

>Note: This value can be set permanently in `group_vars/all/local.yml`
Make sure that you have a serial file in this location: `licenses/serialFile.viptela`
Make sure that you have a serial file that matches the org name in this location: `licenses/serialFile.viptela`

Run the playbook

Expand Down

0 comments on commit d5f0304

Please sign in to comment.