Merge "placement: Remove Nova to Placement extraction step"

deployment/placement/placement-api-container-puppet.yaml

@@ -230,41 +230,9 @@ outputs:
         step_2:
           get_attr: [PlacementLogging, docker_config, step_2]
         step_3:
-          placement_api_db_extract_data_from_nova_api:
-            start_order: 0
-            image: &placement_api_image {get_param: ContainerPlacementImage}
-            net: host
-            detach: false
-            user: root
-            volumes:
-              list_concat:
-                - {get_attr: [ContainersCommon, volumes]}
-                - {get_attr: [PlacementLogging, volumes]}
-                -
-                  - /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
-                  - /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
-            environment:
-              PLACEMENT_USER: placement
-              NOVA_API_USER: nova_api
-              PLACEMENT_DB_HOST: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-              PLACEMENT_PASS: {get_param: PlacementPassword}
-              NOVA_API_DB_HOST: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-              NOVA_API_PASS: {get_param: NovaPassword}
-            # NOTE(lyarwood): We can swallow return codes of 0, 3, 4, 5 as they
-            # suggest this is a fresh deployment with no data to extract
-            # (or that placemant is being deployed without nova). The
-            # current list of return codes provided by the migrate script is:
-            # 0: Success
-            # 1: Usage error
-            # 2: Configuration missing or incomplete
-            # 3: Migration already completed
-            # 4: No data to migrate from nova (new deployment)
-            # 5: Unable to connect to one or both databases
-            # 6: Unable to execute placement's CLI commands
-            command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c 'cd /tmp && /usr/share/placement/mysql-migrate-db.sh --migrate -; ret=$?; if [ $ret -ne 0 ] && [ $ret -ne 3 ] && [ $ret -ne 4 ] && [ $ret -ne 5 ]; then exit $ret; else exit 0; fi'"
           placement_api_db_sync:
             start_order: 1
-            image: *placement_api_image
+            image: &placement_api_image {get_param: ContainerPlacementImage}
             net: host
             detach: false
             user: root