diff options
| -rw-r--r-- | build/Makefile | 1 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 1 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rw-r--r-- | build/rpm_specs/openstack-tacker-server.service | 15 | ||||
| -rw-r--r-- | build/rpm_specs/openstack-tacker.spec | 17 | ||||
| -rwxr-xr-x | build/undercloud.sh | 7 | ||||
| -rw-r--r-- | ci/PR_revision.log | 47 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 9 |
8 files changed, 36 insertions, 63 deletions
diff --git a/build/Makefile b/build/Makefile index 7b392d21..fb0d0c32 100644 --- a/build/Makefile +++ b/build/Makefile @@ -133,6 +133,7 @@ python-pep8-check: $(BUILD_DIR)/openstack-tacker.tar.gz: @echo "Preparing the Tacker RPM prerequisites" git clone $(TACKER_REPO) -b $(TACKER_BRANCH) $(BUILD_DIR)/openstack-tacker-2016.2 + cp rpm_specs/openstack-tacker-server.service $(BUILD_DIR)/openstack-tacker-2016.2 tar czf $(BUILD_DIR)/openstack-tacker.tar.gz -C $(BUILD_DIR) openstack-tacker-2016.2 .PHONY: tacker-rpm diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index ea14ef55..7e0f8017 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -105,6 +105,7 @@ parameter_defaults: - OS::TripleO::Services::VipHosts - OS::TripleO::Services::Etcd - OS::TripleO::Services::Gluon + - OS::TripleO::Services::Tacker ComputeServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 59f67fe8..db695daf 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -66,7 +66,7 @@ tar czf vsperf.tar.gz vsperf rm -rf puppet-tacker git clone https://github.com/openstack/puppet-tacker pushd puppet-tacker > /dev/null -git archive --format=tar.gz --prefix=tacker/ HEAD > ${BUILD_DIR}/puppet-tacker.tar.gz +git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz popd > /dev/null # Master FD.IO Repo diff --git a/build/rpm_specs/openstack-tacker-server.service b/build/rpm_specs/openstack-tacker-server.service new file mode 100644 index 00000000..9bf16cd5 --- /dev/null +++ b/build/rpm_specs/openstack-tacker-server.service @@ -0,0 +1,15 @@ +[Unit] +Description=OpenStack Tacker Server +After=syslog.target network.target + +[Service] +Type=simple +User=tacker +ExecStart=/usr/bin/openstack-tacker-server --config-file /usr/share/tacker/tacker-dist.conf --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log +PrivateTmp=true +NotifyAccess=all +KillMode=process +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec index 7ed5cbdb..0ec4d518 100644 --- a/build/rpm_specs/openstack-tacker.spec +++ b/build/rpm_specs/openstack-tacker.spec @@ -31,7 +31,12 @@ rm requirements.txt rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests # Move config files from /usr/etc/ to /etc mv %{buildroot}/usr/etc %{buildroot} -#install -p -D -m 644 apex/systemd/openstack-tacker.service %{buildroot}%{_unitdir}/openstack-tacker.service +#remove init script +rm -fr %{buildroot}/etc/init.d + +# Install systemd script +install -p -D -m 644 openstack-tacker-server.service %{buildroot}%{_unitdir}/openstack-tacker-server.service + # Remove egg-info rm -rf %{buildroot}/usr/lib/python2.7/site-packages/*egg-info @@ -47,22 +52,22 @@ fi exit 0 %post -%systemd_post openstack-tacker +%systemd_post openstack-tacker-server %preun -%systemd_preun openstack-tacker +%systemd_preun openstack-tacker-server %postun -%systemd_postun_with_restart openstack-tacker +%systemd_postun_with_restart openstack-tacker-server %files /usr/bin/tacker-server /usr/bin/tacker-db-manage /usr/bin/tacker-rootwrap -#%{_unitdir}/openstack-tacker.service +%{_unitdir}/openstack-tacker-server.service /usr/lib/python2.7/site-packages/tacker/* + #%config(noreplace) %attr(-, root, tacker) %{_sysconfdir}/tacker/tacker.conf` -%{_sysconfdir}/init.d/tacker-server %{_sysconfdir}/rootwrap.d/tacker.filters %{_sysconfdir}/tacker/api-paste.ini %{_sysconfdir}/tacker/policy.json diff --git a/build/undercloud.sh b/build/undercloud.sh index e7f4c07b..b27b9108 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -34,7 +34,7 @@ python3 -c 'import py_compile; py_compile.compile("image.py", cfile="image.pyc") # seeding configuration files specific to OPNFV # add congress client # add congress password to python-tripleoclient -# add tacker password to python-tripleoclient +# add tacker password to tripleo-common # upload tacker repo and install the client package # Add performance image scripts # hack for disabling undercloud package update @@ -58,10 +58,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_CONGRESS_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \ --run-command "sed -i '/AodhPassword/a\\ parameters\[\x27CongressPassword\x27\] = passwords\[\x27OVERCLOUD_CONGRESS_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \ --run-command "sed -i '/^SERVICES/a\ \x27congress\x27: {\x27description\x27: \x27Congress Service\x27, \x27type\x27: \x27policy\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ - --run-command "sed -i '/SERVICE_LIST/a\\ \x27tacker\x27: {\x27password_field\x27: \x27OVERCLOUD_TACKER_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \ - --run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_TACKER_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \ - --run-command "sed -i '/AodhPassword/a\\ parameters\[\x27TackerPassword\x27\] = passwords\[\x27OVERCLOUD_TACKER_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \ - --run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 8888 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ + --run-command "sed -i '/SwiftPassword/a\ \x27TackerPassword\x27,' /usr/lib/python2.7/site-packages/tripleo_common/constants.py" \ --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ --install /root/$tackerclient_pkg \ --install "python2-aodhclient" \ diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 285c9c9c..047a26e2 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -2,50 +2,5 @@ #Note this is only needed for triggering commits with no code change in #Apex, but changes do occur in opnfv-tht #PR number, PR Title -15,Add sleep to galera and mongodb service start -18,Fix sql race condition -21,Serialize db_sync calls and increase sql-sleep timer -23,Fix odl env files -25,Force metadata on all scenarios -26,Fixes ODL ML2 IP -30,Adds OVS DPDK config -33,Removes QOS service plugin from Neutron -35,Use nic1 as control plane inteface name instead of default br-ex -38,Fixes nova default floating pool to be 'external' -39,removing extra whitespace from congress parameter -40,Move mongo to step 1 -42, congress typo -44,Fixes nova host/ip bug -43,Add support for live migration and resize -41,Add pcs cleanup exec -50,Fix rabbitmq ipv6 config -52,Add notifier topic to ceilometer -53,Add numa to controller hiera hierarchy -54,fix network mtu -56,fixes tacker config for heat_uri -57,Remove trailing newline from dpdk pci address -58,Enable Ceph on boot -61,Add dpdk bind lock file for vpp deployment -63,Fixes honeycomb on compute -62,Heat Domain -64,Fix missing metadata param -65,Add nic list and ip address to fdio class -67,Fix honeycomb on computes -68,Fix neutron host name -69,Fix vpp mount -72,Fix compute node preconfig DPDK -75,Add AggregateInstanceExtraSpecFilter to Scheduler -76,Add networking-vpp ML2 mechanism driver -77,Update FDIO to use opendaylight_v2 mechanism driver -78,Fix spelling mistake in specs filter -79,Fix controller and compute ip array -80,Change TenantNIC and PublicNIC to be role specific -81,Fix duplicate NeutronServicePlugins -82,Fixes neutron sdnvpn config resource -86,Moves sdnvpn config to env file -87,Pass vlan flag to fdio module when vlan is used for tenant network -88,Default tenant_nic to its physical name -89,Add enic workaround for UCS with OVS DPDK -90,removing /%(tenantid)s from tacker heat_uri -94,Add defaults to vpp_main_core and vpp_corelist_workers 96,Add etcd service +98,Tacker support diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 77778e78..3d718f54 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -53,7 +53,10 @@ function overcloud_deploy { exit 1 fi - + # Enable Tacker + if [ "${deploy_options_array['tacker']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable_tacker.yaml" + fi # Make sure the correct overcloud image is available if [ ! -f $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then @@ -256,10 +259,6 @@ EOI echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI -if [ "${deploy_options_array['tacker']}" == 'False' ]; then - sed -i '/EnableTacker:/c\ EnableTacker: false' ${ENV_FILE} -fi - # Create a key for use by nova for live migration echo "Creating nova SSH key for nova resize support" ssh-keygen -f nova_id_rsa -b 1024 -P "" |