diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-07-16 14:14:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-16 14:14:26 +0000 |
| commit | b5e2f1f65dee0cd692fe275d6bce69a8e410cac3 (patch) | |
| tree | cc212ff450702320fb1330e5c1add769fc708729 /build | |
| parent | 320cbf7d8b69fefb467b85a713c791f6a29b662a (diff) | |
| parent | 10c4d35315d7ffd909520a1c7bc6a3b5b9b871ab (diff) | |
Merge "Add support for kubernetes deployment"
Diffstat (limited to 'build')
| -rw-r--r-- | build/kubernetes-environment.yaml | 26 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex.spec | 3 |
2 files changed, 29 insertions, 0 deletions
diff --git a/build/kubernetes-environment.yaml b/build/kubernetes-environment.yaml new file mode 100644 index 00000000..bfc1f9ad --- /dev/null +++ b/build/kubernetes-environment.yaml @@ -0,0 +1,26 @@ +--- +resource_registry: + OS::TripleO::Services::Docker: OS::Heat::None + + +parameter_defaults: + ControllerServices: + - OS::TripleO::Services::Kernel + - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Snmp + - OS::TripleO::Services::Timezone + - OS::TripleO::Services::TripleoPackages + # - OS::TripleO::Services::TripleoFirewall + - OS::TripleO::Services::Sshd + # - OS::TripleO::Services::OpenShift::Master + # - OS::TripleO::Services::OpenShift::Worker + ComputeServices: + - OS::TripleO::Services::Kernel + - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Snmp + - OS::TripleO::Services::Timezone + - OS::TripleO::Services::TripleoPackages + # - OS::TripleO::Services::TripleoFirewall + - OS::TripleO::Services::Sshd + # - OS::TripleO::Services::OpenShift::Worker + Debug: true diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 7f4eb702..4f9d98fb 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -111,6 +111,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/network_settings_csit.yaml %{_sysconfdir}/opnfv-apex/network_settings_vlans.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml +%{_sysconfdir}/opnfv-apex/k8s-nosdn-nofeature-noha.yaml %doc %{_docdir}/opnfv/LICENSE.rst %doc %{_docdir}/opnfv/installation-instructions.html %doc %{_docdir}/opnfv/release-notes.rst @@ -121,6 +122,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Jun 20 2018 Zenghui Shi <zshi@redhat.com> - 7.0-3 + Adds Kubernetes deployment scenario * Fri Jun 15 2018 Tim Rozet <trozet@redhat.com> - 7.0-2 Adds missing HA deploy settings for Queens * Fri May 25 2018 Tim Rozet <trozet@redhat.com> - 7.0-1 |