diff options
Diffstat (limited to 'xci/var')
| -rw-r--r-- | xci/var/idf.yml | 31 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 8 |
2 files changed, 39 insertions, 0 deletions
diff --git a/xci/var/idf.yml b/xci/var/idf.yml index aa4edd93..8ed55f6f 100644 --- a/xci/var/idf.yml +++ b/xci/var/idf.yml @@ -96,6 +96,36 @@ idf: net-internal: private # Public network for VNF remote acces (ext-net in Openstack) net-vnf: public + osh: &idf_osh + nodes_roles: + opnfv: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public xci: pod_name: vpod1 net_config: *net_config @@ -131,3 +161,4 @@ xci: installers: osa: *idf_osa kubespray: *idf_kubespray + osh: *idf_osh diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index b24a6d98..62ac9fdf 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -30,6 +30,14 @@ kubespray_git_url: "{{ lookup('env','KUBESPRAY_GIT_URL') }}" kubespray_version: "{{ lookup('env','KUBESPRAY_VERSION') }}" xci_kube_ansible_pip_version: "{{ lookup('env','XCI_KUBE_ANSIBLE_PIP_VERSION') }}" +# openstack-helm variables +osh_git_url: "{{ lookup('env','OSH_GIT_URL') }}" +osh_version: "{{ lookup('env','OSH_VERSION') }}" +osh_infra_git_url: "{{ lookup('env','OSH_INFRA_GIT_URL') }}" +osh_infra_version: "{{ lookup('env','OSH_INFRA_VERSION') }}" +osh_helm_binary_url: "{{ lookup('env','OSH_HELM_BINARY_URL') }}" +osh_helm_binary_version: "{{ lookup('env','OSH_HELM_BINARY_VERSION') }}" + # variables for other components keepalived_git_url: "{{ lookup('env','KEEPALIVED_GIT_URL') }}" haproxy_version: "{{ lookup('env','HAPROXY_VERSION') }}" |