From ee08483e09cb925d50f98dd97b5a5ef8eb4dedf3 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Thu, 7 Apr 2022 17:10:54 -0700 Subject: [PATCH] Upgrade config files to yoga release --- etc/kolla/globals.yml | 20 ++- etc/kolla/kolla-build.ini | 324 ++++++++++++++++++++++++++++++++++++-- etc/kolla/passwords.yml | 14 ++ registry.sh | 2 +- samples/aio/hosts.ini | 15 +- samples/noha/tail.ini | 15 +- 6 files changed, 359 insertions(+), 31 deletions(-) diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index a5c51fce4..3fdf16af4 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -354,7 +354,7 @@ enable_heat: "{{ enable_openstack_core | bool }}" #enable_horizon_zun: "{{ enable_zun | bool }}" #enable_influxdb: "{{ enable_monasca | bool or (enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb') }}" #enable_ironic: "no" -#enable_ironic_ipxe: "no" +#enable_ironic_ipxe: "yes" #enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}" #enable_ironic_pxe_uefi: "no" #enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" @@ -410,8 +410,8 @@ enable_skydive: "no" #enable_telegraf: "no" #enable_trove: "no" #enable_trove_singletenant: "no" +#enable_venus: "no" #enable_vitrage: "no" -#enable_vmtp: "no" #enable_watcher: "no" #enable_zookeeper: "{{ enable_kafka | bool or enable_storm | bool }}" #enable_zun: "no" @@ -533,6 +533,7 @@ enable_skydive: "no" # Enable / disable Cinder backends #cinder_backend_ceph: "no" #cinder_backend_vmwarevc_vmdk: "no" +#cinder_backend_vmware_vstorage_object: "no" #cinder_volume_group: "cinder-volumes" # Valid options are [ '', redis, etcd ] #cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}" @@ -559,7 +560,8 @@ enable_skydive: "no" ################### # Valid options are [ bind9 ] #designate_backend: "bind9" -#designate_ns_record: "sample.openstack.org" +#designate_ns_record: +# - "ns1.example.org" # Valid options are [ '', redis ] #designate_coordination_backend: "{{ 'redis' if enable_redis|bool else '' }}" @@ -718,7 +720,8 @@ enable_skydive: "no" #enable_prometheus_openstack_exporter: "{{ enable_prometheus | bool }}" #enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}" #enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}" -#enable_prometheus_libvirt_exporter: "no" +#enable_prometheus_libvirt_exporter: "{{ enable_prometheus | bool and enable_nova | bool and nova_compute_virt_type in ['kvm', 'qemu'] }}" +#enable_prometheus_etcd_integration: "{{ enable_prometheus | bool and enable_etcd | bool }}" # List of extra parameters passed to prometheus. You can add as many to the list. #prometheus_cmdline_extras: @@ -727,6 +730,15 @@ enable_skydive: "no" # and container labels are not exposed to reduce time series cardinality. #prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=percpu,referenced_memory,cpu_topology,resctrl,udp,advtcp,sched,hugetlb,memory_numa,tcp,process" +# Extra parameters passed to Prometheus exporters. +#prometheus_blackbox_exporter_cmdline_extras: +#prometheus_elasticsearch_exporter_cmdline_extras: +#prometheus_haproxy_exporter_cmdline_extras: +#prometheus_memcached_exporter_cmdline_extras: +#prometheus_mysqld_exporter_cmdline_extras: +#prometheus_node_exporter_cmdline_extras: +#prometheus_openstack_exporter_cmdline_extras: + # Example of setting endpoints for prometheus ceph mgr exporter. # You should add all ceph mgr's in your external ceph deployment. #prometheus_ceph_mgr_exporter_endpoints: diff --git a/etc/kolla/kolla-build.ini b/etc/kolla/kolla-build.ini index 7bcb28c32..627f2c879 100644 --- a/etc/kolla/kolla-build.ini +++ b/etc/kolla/kolla-build.ini @@ -136,7 +136,7 @@ work_dir = /tmp/kolla/work_dir # OpenStack release for building kolla source images and kolla-toolbox # image (string value) -#openstack_release = xena +#openstack_release = yoga # Branch for source images (internal; with a dash; please set # openstack-release instead) (string value) @@ -177,7 +177,7 @@ quiet = true # Comma separated list of .rpm or .repo file(s) or URL(s) to install # before building containers (list value) -#rpm_setup_config = https://trunk.rdoproject.org/centos8-xena/consistent/delorean.repo,https://trunk.rdoproject.org/centos8-xena/delorean-deps.repo +#rpm_setup_config = https://trunk.rdoproject.org/centos8-yoga/consistent/delorean.repo,https://trunk.rdoproject.org/centos8-yoga/delorean-deps.repo # Path to custom sources.list (string value) #apt_sources_list = @@ -249,6 +249,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [aodh-user] @@ -285,6 +288,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [barbican-user] @@ -321,6 +327,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [bifrost-user] @@ -357,6 +366,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [blazar-user] @@ -393,6 +405,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [ceilometer-user] @@ -429,6 +444,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [cinder-user] @@ -465,6 +483,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [cloudkitty-user] @@ -533,6 +554,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [cyborg-user] @@ -569,6 +593,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [designate-user] @@ -685,6 +712,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [freezer-base] @@ -705,6 +735,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [freezer-user] @@ -741,6 +774,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [glance-user] @@ -777,6 +813,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = 4.4.1 +# Whether the source is enabled (boolean value) +#enabled = true + [gnocchi-user] @@ -861,6 +900,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [heat-user] @@ -897,6 +939,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-blazar-dashboard] @@ -917,6 +962,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-cloudkitty-dashboard] @@ -937,6 +985,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-designate-dashboard] @@ -957,6 +1008,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-freezer-web-ui] @@ -977,6 +1031,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-heat-dashboard] @@ -997,6 +1054,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-ironic-ui] @@ -1017,6 +1077,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-magnum-ui] @@ -1037,6 +1100,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-manila-ui] @@ -1057,6 +1123,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-masakari-dashboard] @@ -1077,6 +1146,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-mistral-dashboard] @@ -1097,6 +1169,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-monasca-ui] @@ -1117,6 +1192,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-murano-dashboard] @@ -1137,6 +1215,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-neutron-vpnaas-dashboard] @@ -1152,11 +1233,14 @@ quiet = true #type = url # The location for source install (string value) -#location = $tarballs_base/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard-${openstack_branch}.tar.gz +#location = $tarballs_base/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard-6.0.0.tar.gz # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-octavia-dashboard] @@ -1177,6 +1261,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-sahara-dashboard] @@ -1197,6 +1284,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-senlin-dashboard] @@ -1217,6 +1307,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-solum-dashboard] @@ -1237,6 +1330,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-tacker-dashboard] @@ -1257,6 +1353,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-trove-dashboard] @@ -1277,6 +1376,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-vitrage-dashboard] @@ -1297,6 +1399,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-watcher-dashboard] @@ -1317,6 +1422,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-plugin-zun-ui] @@ -1337,6 +1445,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [horizon-user] @@ -1405,6 +1516,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [ironic-inspector] @@ -1425,6 +1539,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [ironic-inspector-user] @@ -1493,6 +1610,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [keystone-user] @@ -1561,6 +1681,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [kuryr-libnetwork] @@ -1581,6 +1704,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [kuryr-user] @@ -1598,6 +1724,22 @@ quiet = true #group = kuryr +[letsencrypt-user] + +# +# From kolla +# + +# The user id (integer value) +#uid = 42488 + +# The group id (integer value) +#gid = 42488 + +# The group name (string value) +#group = letsencrypt + + [libvirt-user] # @@ -1649,6 +1791,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [magnum-user] @@ -1685,6 +1830,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [manila-user] @@ -1721,6 +1869,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [masakari-monitors] @@ -1741,6 +1892,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [masakari-user] @@ -1793,6 +1947,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [mistral-base-plugin-tacker] @@ -1813,6 +1970,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [mistral-user] @@ -1849,6 +2009,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-api] @@ -1864,11 +2027,14 @@ quiet = true #type = url # The location for source install (string value) -#location = $tarballs_base/openstack/monasca-api/monasca-api-${openstack_branch}.tar.gz +#location = $tarballs_base/openstack/monasca-api/monasca-api-8.0.0.tar.gz # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-notification] @@ -1889,6 +2055,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-persister] @@ -1909,6 +2078,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-statsd] @@ -1929,6 +2101,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-thresh] @@ -1949,6 +2124,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-thresh-additions-monasca-common] @@ -1969,6 +2147,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [monasca-user] @@ -2021,6 +2202,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [murano-user] @@ -2073,6 +2257,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-base-plugin-networking-baremetal] @@ -2093,6 +2280,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-base-plugin-networking-generic-switch] @@ -2113,6 +2303,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-base-plugin-networking-sfc] @@ -2133,6 +2326,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-base-plugin-vpnaas-agent] @@ -2153,6 +2349,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-bgp-dragent] @@ -2173,6 +2372,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-server-plugin-neutron-dynamic-routing] @@ -2193,6 +2395,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [neutron-user] @@ -2229,6 +2434,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [nfast-user] @@ -2265,6 +2473,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [nova-base-plugin-blazar] @@ -2285,6 +2496,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [nova-user] @@ -2321,6 +2535,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [octavia-base] @@ -2341,6 +2558,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [octavia-driver-agent-plugin-ovn-octavia-provider] @@ -2361,6 +2581,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [octavia-user] @@ -2413,6 +2636,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [openvswitch-user] @@ -2449,6 +2675,9 @@ quiet = true # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [placement-user] @@ -2473,7 +2702,7 @@ quiet = true # # Infra images (list value) -infra = cron,elasticsearch,etcd,fluentd,haproxy,hacluster,keepalived,kibana,kolla-toolbox,logstash,mariadb,memcached,openvswitch,proxysql,qdrouterd,rabbitmq,redis,skydive,storm,tgtd +infra = cron,elasticsearch,etcd,fluentd,haproxy,hacluster,keepalived,kibana,kolla-toolbox,letsencrypt,logstash,mariadb,memcached,openvswitch,proxysql,qdrouterd,rabbitmq,redis,skydive,storm,tgtd # Main images (list value) main = ceilometer,cinder,glance,heat,horizon,iscsi,keystone,neutron,nova-,placement,swift @@ -2488,7 +2717,7 @@ custom = chrony,cron,kolla-toolbox,fluentd,glance,haproxy,heat,horizon,keepalive # All images # python -c "from kolla.common import config;print('all='+','.join(config.SOURCES.keys()))" -all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-base,ceilometer-base-plugin-panko,cinder-base,cloudkitty-base,cyborg-base,designate-base,freezer-api,freezer-base,glance-base,gnocchi-base,heat-base,horizon,horizon-plugin-blazar-dashboard,horizon-plugin-cloudkitty-dashboard,horizon-plugin-designate-dashboard,horizon-plugin-freezer-web-ui,horizon-plugin-heat-dashboard,horizon-plugin-ironic-ui,horizon-plugin-magnum-ui,horizon-plugin-manila-ui,horizon-plugin-masakari-dashboard,horizon-plugin-mistral-dashboard,horizon-plugin-monasca-ui,horizon-plugin-murano-dashboard,horizon-plugin-neutron-vpnaas-dashboard,horizon-plugin-octavia-dashboard,horizon-plugin-sahara-dashboard,horizon-plugin-senlin-dashboard,horizon-plugin-solum-dashboard,horizon-plugin-tacker-dashboard,horizon-plugin-trove-dashboard,horizon-plugin-vitrage-dashboard,horizon-plugin-watcher-dashboard,horizon-plugin-zun-ui,ironic-base,ironic-inspector,keystone-base,kuryr-base,kuryr-libnetwork,magnum-base,manila-base,masakari-base,masakari-monitors,mistral-base,mistral-base-plugin-tacker,monasca-agent,monasca-api,monasca-notification,monasca-persister,monasca-statsd,monasca-thresh,monasca-thresh-additions-monasca-common,murano-base,neutron-base,neutron-base-plugin-networking-baremetal,neutron-base-plugin-networking-generic-switch,neutron-base-plugin-networking-sfc,neutron-base-plugin-vpnaas-agent,neutron-bgp-dragent,neutron-server-plugin-neutron-dynamic-routing,neutron-vpnaas-agent,nova-base,nova-base-plugin-blazar,octavia-base,octavia-api-plugin-ovn-octavia-provider,octavia-driver-agent-plugin-ovn-octavia-provider,panko-base,placement-base,tempest-plugin-tempest-conf,tempest-plugin-barbican,tempest-plugin-blazar,tempest-plugin-cinder,tempest-plugin-ec2api,tempest-plugin-heat,tempest-plugin-ironic,tempest-plugin-keystone,tempest-plugin-magnum,tempest-plugin-manila,tempest-plugin-mistral,tempest-plugin-monasca,tempest-plugin-murano,tempest-plugin-neutron,tempest-plugin-patrole,tempest-plugin-telemetry,tempest-plugin-trove,tempest-plugin-vitrage,tempest-plugin-watcher,rally,rally-plugin-openstack,sahara-base,sahara-base-plugin-ambari,sahara-base-plugin-cdh,sahara-base-plugin-mapr,sahara-base-plugin-spark,sahara-base-plugin-storm,sahara-base-plugin-vanilla,senlin-base,solum-base,swift-base,tacker-base,tacker-base-plugin-networking-sfc,tempest,trove-base,vitrage-base,vmtp,watcher-base,zun-base +all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-base,cinder-base,cloudkitty-base,cyborg-base,designate-base,freezer-api,freezer-base,glance-base,gnocchi-base,heat-base,horizon,horizon-plugin-blazar-dashboard,horizon-plugin-cloudkitty-dashboard,horizon-plugin-designate-dashboard,horizon-plugin-freezer-web-ui,horizon-plugin-heat-dashboard,horizon-plugin-ironic-ui,horizon-plugin-magnum-ui,horizon-plugin-manila-ui,horizon-plugin-masakari-dashboard,horizon-plugin-mistral-dashboard,horizon-plugin-monasca-ui,horizon-plugin-murano-dashboard,horizon-plugin-neutron-vpnaas-dashboard,horizon-plugin-octavia-dashboard,horizon-plugin-sahara-dashboard,horizon-plugin-senlin-dashboard,horizon-plugin-solum-dashboard,horizon-plugin-tacker-dashboard,horizon-plugin-trove-dashboard,horizon-plugin-vitrage-dashboard,horizon-plugin-watcher-dashboard,horizon-plugin-zun-ui,ironic-base,ironic-inspector,keystone-base,kuryr-base,kuryr-libnetwork,magnum-base,manila-base,masakari-base,masakari-monitors,mistral-base,mistral-base-plugin-tacker,monasca-agent,monasca-api,monasca-notification,monasca-persister,monasca-statsd,monasca-thresh,monasca-thresh-additions-monasca-common,murano-base,neutron-base,neutron-base-plugin-networking-baremetal,neutron-base-plugin-networking-generic-switch,neutron-base-plugin-networking-sfc,neutron-base-plugin-vpnaas-agent,neutron-bgp-dragent,neutron-server-plugin-neutron-dynamic-routing,neutron-vpnaas-agent,nova-base,nova-base-plugin-blazar,octavia-base,octavia-api-plugin-ovn-octavia-provider,octavia-driver-agent-plugin-ovn-octavia-provider,placement-base,sahara-base,sahara-base-plugin-ambari,sahara-base-plugin-cdh,sahara-base-plugin-mapr,sahara-base-plugin-spark,sahara-base-plugin-storm,sahara-base-plugin-vanilla,senlin-base,solum-base,swift-base,tacker-base,tacker-base-plugin-networking-sfc,trove-base,venus-base,vitrage-base,watcher-base,zun-base [prometheus-user] @@ -2621,6 +2850,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-base-plugin-ambari] @@ -2641,6 +2873,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-base-plugin-cdh] @@ -2661,6 +2896,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-base-plugin-mapr] @@ -2681,6 +2919,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-base-plugin-spark] @@ -2701,6 +2942,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-base-plugin-storm] @@ -2721,6 +2965,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-base-plugin-vanilla] @@ -2741,6 +2988,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [sahara-user] @@ -2777,6 +3027,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [senlin-user] @@ -2845,6 +3098,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [solum-user] @@ -2897,6 +3153,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [swift-user] @@ -2933,6 +3192,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [tacker-base-plugin-networking-sfc] @@ -2953,6 +3215,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [tacker-user] @@ -3037,6 +3302,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [trove-user] @@ -3054,7 +3322,7 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b #group = trove -[vitrage-base] +[venus-base] # # From kolla @@ -3068,29 +3336,32 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b #type = url # The location for source install (string value) -#location = $tarballs_base/openstack/vitrage/vitrage-${openstack_branch}.tar.gz +#location = $tarballs_base/openstack/venus/venus-master.tar.gz # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true -[vitrage-user] + +[venus-user] # # From kolla # # The user id (integer value) -#uid = 42459 +#uid = 42489 # The group id (integer value) -#gid = 42459 +#gid = 42489 # The group name (string value) -#group = vitrage +#group = venus -[vmtp] +[vitrage-base] # # From kolla @@ -3104,11 +3375,30 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b #type = url # The location for source install (string value) -#location = $tarballs_base/openstack/vmtp/vmtp-master.tar.gz +#location = $tarballs_base/openstack/vitrage/vitrage-${openstack_branch}.tar.gz # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + + +[vitrage-user] + +# +# From kolla +# + +# The user id (integer value) +#uid = 42459 + +# The group id (integer value) +#gid = 42459 + +# The group name (string value) +#group = vitrage + [vmtp-user] @@ -3145,6 +3435,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [watcher-user] @@ -3197,6 +3490,9 @@ all=openstack-base,aodh-base,barbican-base,bifrost-base,blazar-base,ceilometer-b # Git reference to pull, commit sha, tag or branch name (string value) #reference = +# Whether the source is enabled (boolean value) +#enabled = true + [zun-user] diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 9b0dd9925..86fd79727 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -29,6 +29,8 @@ vmware_dvs_host_password: vmware_nsxv_password: vmware_vcenter_host_password: nsxv3_api_password: +vmware_nsxp_api_password: +vmware_nsxp_metadata_proxy_shared_secret: ##################### # Hitachi NAS support @@ -166,6 +168,9 @@ zun_keystone_password: vitrage_database_password: vitrage_keystone_password: +venus_database_password: +venus_keystone_password: + masakari_database_password: masakari_keystone_password: @@ -194,6 +199,10 @@ octavia_amp_ssh_key: private_key: public_key: +neutron_ssh_key: + private_key: + public_key: + #################### # Gnocchi options #################### @@ -251,3 +260,8 @@ keystone_federation_openid_crypto_password: # Ceph RadosGW options #################### ceph_rgw_keystone_password: + +################## +# libvirt options +################## +libvirt_sasl_password: diff --git a/registry.sh b/registry.sh index ad6c5b9e8..53d5c3a8c 100755 --- a/registry.sh +++ b/registry.sh @@ -20,7 +20,7 @@ fi curl -fsSL http://bit.ly/install_pkg | PKG_COMMANDS_LIST="pip,skopeo,docker,jq,git,crudini" bash if ! command -v kolla-build; then - pip install "git+https://github.com/openstack/kolla.git@${OS_KOLLA_VERSION:-stable/xena}" + pip install "git+https://github.com/openstack/kolla.git@${OS_KOLLA_VERSION:-stable/yoga}" pip install docker-squash fi diff --git a/samples/aio/hosts.ini b/samples/aio/hosts.ini index 5ea72e174..f7aa2101a 100644 --- a/samples/aio/hosts.ini +++ b/samples/aio/hosts.ini @@ -183,9 +183,6 @@ control [senlin:children] control -[vmtp:children] -control - [trove:children] control @@ -219,6 +216,9 @@ control [blazar:children] control +[venus:children] +monitoring + # Additional control implemented here. These groups allow you to control which # services run on which hosts at a per-service level. # @@ -412,9 +412,6 @@ monasca-agent [monasca-api:children] monasca -[monasca-grafana:children] -monasca - [monasca-log-persister:children] monasca @@ -738,3 +735,9 @@ ovn-database [ovn-sb-db:children] ovn-database + +[venus-api:children] +venus + +[venus-manager:children] +venus diff --git a/samples/noha/tail.ini b/samples/noha/tail.ini index eb7359b27..5ca553bf8 100644 --- a/samples/noha/tail.ini +++ b/samples/noha/tail.ini @@ -175,9 +175,6 @@ control [senlin:children] control -[vmtp:children] -control - [trove:children] control @@ -211,6 +208,9 @@ control [blazar:children] control +[venus:children] +monitoring + # Additional control implemented here. These groups allow you to control which # services run on which hosts at a per-service level. # @@ -404,9 +404,6 @@ monasca-agent [monasca-api:children] monasca -[monasca-grafana:children] -monasca - [monasca-log-persister:children] monasca @@ -730,3 +727,9 @@ ovn-database [ovn-sb-db:children] ovn-database + +[venus-api:children] +venus + +[venus-manager:children] +venus